Messages in this thread | | | Date | Mon, 1 Jun 2015 12:05:39 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the uml tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/hppfs/hppfs.c between commit f74a14e870c8 ("um: Remove hppfs") from the uml tree and commits 680baacbca69 ("new ->follow_link() and ->put_link() calling conventions"), 6e77137b363b ("don't pass nameidata to ->follow_link()") and 5f2c4179e129 ("switch ->put_link() from dentry to inode") from the vfs tree.
I fixed it up (I just removed the file) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |