Hi all, Today's linux-next merge of the userns tree got conflicts in:
fs/proc/inode.c
fs/proc/root.c
between commits:
0223e0999be2 ("procfs: Move proc_fill_super() to fs/proc/root.c")
83cd45075c36 ("proc: Add fs_context support to procfs")
from the vfs tree and commit:
cc8cda3af2ba ("proc: Simplify and fix proc by removing the kernel mount")
from the userns tree.
I don't know how to fix this up, so I just dropped the userns tree for
today (since it only contained that one commit).
--
Cheers,
Stephen Rothwell
pgpmfPoU8dNZR.pgp
Description: OpenPGP digital signature
