Re: linux-next: manual merge of the akpm-current tree with the scsi tree

Hi all, On Wed, 20 Jun 2018 13:54:58 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > lib/percpu_ida.c > > between commit: > > acf3ff616ee2 ("scsi: Remove percpu_ida") > > from the scsi tree and commit: > > 0c4d6e08c775 ("lib/p

linux-next: manual merge of the akpm-current tree with the scsi tree

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: lib/percpu_ida.c between commit: acf3ff616ee2 ("scsi: Remove percpu_ida") from the scsi tree and commit: 0c4d6e08c775 ("lib/percpu_ida.c: don't do alloc from per-CPU list if there is none") from the akpm-curr