On Thu, 10 May 2012 18:51:55 +1000, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got conflicts in > kernel/lglock.c, include/linux/lglock.h, fs/namespace.c and fs/internal.h > between various commits from the rr tree and commit "brlocks/lglocks: > cleanups" from the akpm tree. > > The akpm tree patch seems to be a merge of the rr tree commits, so I > dropped the akpm tree patch. Al said he'd take them, so I dropped mine now too. Thanks, Rusty. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
