Messages in this thread | | | Date | Wed, 3 Apr 2013 23:56:34 -0700 | From | Andrew Morton <> | Subject | Re: linux-next: manual merge of the akpm tree with the vfs tree |
| |
On Thu, 4 Apr 2013 17:26:48 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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.
| |