Re: linux-next: manual merge of the percpu tree with the ext4 tree

Hi Ted, On Mon, 8 Sep 2014 16:41:14 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the percpu tree got a conflict in > fs/ext4/super.c between commit eb68d0e2fc5a ("ext4: track extent status > tree shrinker delay statictics") from the ext4 tree and commit > 908c7f1949cb ("percpu_c

linux-next: manual merge of the percpu tree with the ext4 tree

Hi all, Today's linux-next merge of the percpu tree got a conflict in fs/ext4/super.c between commit eb68d0e2fc5a ("ext4: track extent status tree shrinker delay statictics") from the ext4 tree and commit 908c7f1949cb ("percpu_counter: add @gfp to percpu_counter_init()") from the percpu tree. I f