Messages in this thread | | | Date | Wed, 13 May 2015 14:26:23 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the security tree with the vfs tree |
| |
Hi James,
Today's linux-next merge of the security tree got a conflict in security/capability.c between commits 37882db0546c ("SECURITY: remove nameidata arg from inode_follow_link") and bda0be7ad994 ("security: make inode_follow_link RCU-walk aware") from the vfs tree and commit 1ddd3b4e07a4 ("LSM: Remove unused capability.c") from the security tree.
I fixed it up (the latter removed the file, so I did that) 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] | |