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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpXBhd7c6Q9b.pgp
Description: PGP signature
