linux-next: manual merge of the security-testing tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi James,

Today's linux-next merge of the security-testing tree got a conflict in
fs/xfs/linux-2.6/xfs_ioctl.c between commit
743bb4650da9e2595d6cedd01c680b5b9398c74a ("XFS] Move copy_from_user calls
out of ioctl helpers into ioctl switch.") from the xfs tree and commit
745ca2475a6ac596e3d8d37c2759c0fbe2586227 ("CRED: Pass credentials through
dentry_open()") from the security-testing tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

diff --cc fs/xfs/linux-2.6/xfs_ioctl.c
index c8f1e63,281cbd5..0000000
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@@ -314,7 -322,7 +315,7 @@@ xfs_open_by_handle
        mntget(parfilp->f_path.mnt);
  
        /* Create file pointer. */
-       filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags);
 -      filp = dentry_open(dentry, parfilp->f_path.mnt, hreq.oflags, cred);
++      filp = dentry_open(dentry, parfilp->f_path.mnt, hreq->oflags, cred);
        if (IS_ERR(filp)) {
                put_unused_fd(new_fd);
                return -XFS_ERROR(-PTR_ERR(filp));