Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git

diff --cc fs/fuse/dir.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/nfsd/nfs4xdr.c
index 5d413e751c744332790c2e2a042548a52995d091,8dd2e2ada474d7e64a0a6c62f780711c9eafc85b..e67420729ecd609c46c3f5d411dea73aa0047ffc
--- 1/fs/nfsd/nfs4xdr.c
--- 2/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@@ -2941,10 -2919,8 +2941,9 @@@ struct nfsd4_fattr_args 
        struct kstat            stat;
        struct kstatfs          statfs;
        struct nfs4_acl         *acl;
 +      u64                     change_attr;
  #ifdef CONFIG_NFSD_V4_SECURITY_LABEL
-       void                    *context;
-       int                     contextlen;
+       struct lsm_context      context;
  #endif
        u32                     rdattr_err;
        bool                    contextsupport;

diff --cc kernel/auditsc.c
Simple merge

diff --cc net/ipv4/ip_sockglue.c
Simple merge

diff --cc net/netfilter/nf_conntrack_netlink.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge