Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: security: define round_hint_to_min in !CONFIG_SECURITY Security/SELinux: seperate lsm specific mmap_min_addr SELinux: call cap_file_mmap in selinux_file_mmap Capabilities: move cap_file_mmap to commoncap.c
2026-09-26 18:16:26 +00:00 · 2009-08-17 13:38:58 -07:00 · 2009-08-17 13:38:58 -07:00 · 52dec22e73
commit 52dec22e73
parent 08e53fcb0d 1d9959734a
12 changed files with 137 additions and 41 deletions
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
--- a/mm/Kconfig
+++ b/mm/Kconfig
--- a/mm/mmap.c
+++ b/mm/mmap.c
--- a/mm/nommu.c
+++ b/mm/nommu.c
--- a/security/Kconfig
+++ b/security/Kconfig
--- a/security/Makefile
+++ b/security/Makefile
--- a/security/capability.c
+++ b/security/capability.c
--- a/security/commoncap.c
+++ b/security/commoncap.c
--- a/security/min_addr.c
+++ b/security/min_addr.c
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c