On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi Andrew, > > Today's linux-next merge of the akpm tree got a conflict in > fs/proc/generic.c between several commits from the vfs tree and commit > "procfs: improve scaling in proc" from the akpm tree. > > I just dropped the akpm tree patch (and the following > "procfs-improve-scaling-in-proc-v5") as the conflicts are a bit complex. Well perhaps the vfs tree should start paying some attention to the rest of the world, particularly after -rc5. -- 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
