Messages in this thread | | | Date | Thu, 7 May 2015 12:05:07 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the vfs tree with the f2fs tree |
| |
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in fs/f2fs/namei.c between commit 04002bddf33a ("f2fs: fix wrong error hanlder in f2fs_follow_link") from the f2fs tree and commits 32a09a012611 ("new ->follow_link() and ->put_link() calling conventions") and e1a9e9dd8594 ("don't pass nameidata to ->follow_link()") from the vfs tree.
I fixed it up (the vfs tree changes are a superset of the f2fs tree changes, so I just used them) 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] | |