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

Hi all, Today's linux-next merge of the akpm-current tree got a conflict in: include/linux/sched.h between commit: 7df6cae06c3b ("x86/mce: Send #MC singal from task work") from the rcu tree and commit: c0218a9a3a60 ("fs/buffer.c: add debug print for __getblk_gfp() stall problem") from

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

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in init/Kconfig between commit d2cf0d24cb2d ("rcu: Fix attempt to avoid unsolicited offloading of callbacks") from the rcu tree and commit 0c67534a7708 ("init/Kconfig: move RCU_NOCB_CPU dependencies to choice") from the ak

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

On Mon, Feb 10, 2014 at 03:00:47PM +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep > checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock

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

Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in mm/slub.c between commit f4e40a71719d ("slub: Fix add_full() lockdep checks") from the rcu tree and commit aee03fe7a7c8 ("mm/slub.c: list_lock may not be held in some circumstances") from the akpm-current tree. These p