Messages in this thread | | | Date | Tue, 23 Aug 2011 13:52:37 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the security tree with the ocfs2 tree |
| |
Hi James,
Today's linux-next merge of the security tree got a conflict in fs/ocfs2/xattr.c between commit d27fb6a99c41 ("ocfs2: free memory allocated by inode_init_security") from the ocfs2 tree and commit 9d8f13ba3f48 ("security: new security_inode_init_security API adds function callback") from the security tree.
I assume that the latter supercedes the former, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |