Eric Paris
fc582aef7d
Linux 3.12
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
iQEcBAABAgAGBQJSdt9HAAoJEHm+PkMAQRiGnzEH/345Keg5dp+oKACnokBfzOtp
V0p3g5EBsGtzEVnV+1B96trczDUtWdDFFr5GfGSj565NBQpFyc+iZC1mC99RDJCs
WUquGFqlLMK2aV0SbKwCO4K1rJ5A0TRVj0ZRJOUJUY7jwNf5Qahny0WBVjO/8qAY
UvJK1rktBClhKdH53YtpDHHgXBeZ2LOrzt1fQ/AMpujGbZauGvnLdNOli5r2kCFK
jzoOgFLvX+PHU/5/d4/QyJPeQNPva5hjk5Ho9UuSJYhnFtPO3EkD4XZLcpcbNEJb
LqBvbnZWm6CS435lfU1l93RqQa5xMO9ITk0oe4h69syTSHwWk9aJ+ZTc/4Up+t8=
=57MC
-----END PGP SIGNATURE-----
Merge tag 'v3.12'
Linux 3.12
Conflicts:
fs/exec.c
|
2013-11-22 18:57:54 -05:00 |
| .. |
|
apparmor
|
apparmor: fix bad lock balance when introspecting policy
|
2013-10-16 11:54:01 +11:00 |
|
integrity
|
xattr: Constify ->name member of "struct xattr".
|
2013-07-25 19:30:03 +10:00 |
|
keys
|
aio: don't include aio.h in sched.h
|
2013-05-07 20:16:25 -07:00 |
|
selinux
|
Linux 3.12
|
2013-11-22 18:57:54 -05:00 |
|
smack
|
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
|
2013-09-07 14:34:07 -07:00 |
|
tomoyo
|
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
|
2013-05-01 17:51:54 -07:00 |
|
yama
|
yama: Better permission check for ptraceme
|
2013-03-26 13:17:58 -07:00 |
|
capability.c
|
xattr: Constify ->name member of "struct xattr".
|
2013-07-25 19:30:03 +10:00 |
|
commoncap.c
|
capabilities: allow nice if we are privileged
|
2013-08-30 23:44:09 -07:00 |
|
device_cgroup.c
|
cgroup: make css_for_each_descendant() and friends include the origin css in the iteration
|
2013-08-08 20:11:27 -04:00 |
|
inode.c
|
securityfs: fix object creation races
|
2012-01-10 10:20:35 -05:00 |
|
Kconfig
|
KEYS: Move the key config into security/keys/Kconfig
|
2012-05-11 10:56:56 +01:00 |
|
lsm_audit.c
|
audit: suppress stock memalloc failure warnings since already managed
|
2013-11-05 11:09:11 -05:00 |
|
Makefile
|
security: Yama LSM
|
2012-02-10 09:18:52 +11:00 |
|
min_addr.c
|
mmap_min_addr check CAP_SYS_RAWIO only for write
|
2010-04-23 08:56:31 +10:00 |
|
security.c
|
xattr: Constify ->name member of "struct xattr".
|
2013-07-25 19:30:03 +10:00 |