Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in:
fs/nsfs.c
between the userns tree and patch
"nsfs: fix for seq_printf() API change"
from the akpm tree.
The commit ed2ffc74eee8 ("nsfs: Add a show_path method to fix mountinfo")
that was being fixed by the akpm tree patch was dropped from the usernsn
tree, so I dropped the akpm tree patch as well.
--
Cheers,
Stephen Rothwell [email protected]
pgpSc8R2DsKdt.pgp
Description: OpenPGP digital signature
