Messages in this thread | | | Date | Thu, 2 Jul 2015 14:26:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the userns tree |
| |
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 sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |