Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: NFS: use new LSM interfaces to explicitly set mount options LSM/SELinux: Interfaces to allow FS to control mount options
Showing
- fs/nfs/internal.h 3 additions, 0 deletionsfs/nfs/internal.h
- fs/nfs/super.c 62 additions, 2 deletionsfs/nfs/super.c
- fs/super.c 2 additions, 2 deletionsfs/super.c
- include/linux/security.h 74 additions, 25 deletionsinclude/linux/security.h
- security/dummy.c 13 additions, 10 deletionssecurity/dummy.c
- security/security.c 15 additions, 8 deletionssecurity/security.c
- security/selinux/hooks.c 94 additions, 81 deletionssecurity/selinux/hooks.c
- security/selinux/include/security.h 5 additions, 0 deletionssecurity/selinux/include/security.h
- security/smack/smack_lsm.c 1 addition, 8 deletionssecurity/smack/smack_lsm.c
Loading
Please register or sign in to comment