Hi James,
Today's linux-next merge of the security-testing tree got a conflict in
fs/xfs/xfs_vnodeops.h between commit
ea5a3dc8356bf1cf27bab9a5a0da5dfbbb82013d ("[XFS] kill sys_cred") from the
xfs tree and commit b6dff3ec5e116e3af6f537d4caedcad6b9e5082a ("CRED:
Separate task security context from task_struct") from the
security-testing tree.
I fixed it up (by using the xfs tree version - since that removed the
parameters that the latter changed) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpEXvK6rg5Xo.pgp
Description: PGP signature
