linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-21 21:02:24 +00:00

History

Linus Torvalds e2f3b78557 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull SELinux regression fixes from James Morris.

Andrew Morton has a box that hit that open perms problem.

I also renamed the "epollwakeup" selinux name for the new capability to
be "block_suspend", to match the rename done by commit d9914cf66181
("PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND").

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  SELinux: do not check open perms if they are not known to policy
  SELinux: include definition of new capabilities

2012-07-18 13:42:44 -07:00

apparmor

split ->file_mmap() into ->mmap_addr()/->mmap_file()

2012-05-31 13:11:54 -04:00

integrity

ima: fix filename hint to reflect script interpreter name

2012-05-16 10:36:41 +10:00

keys

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

2012-05-31 18:47:30 -07:00

selinux

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