David S. Miller 6bc19fb82d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.

This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge.  Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-06-05 16:37:30 -07:00

..

apparmor

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

integrity

ima: eliminate passing d_name.name to process_measurement()

2013-04-17 17:20:57 -07:00

keys

aio: don't include aio.h in sched.h

2013-05-07 20:16:25 -07:00

selinux

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-06-05 16:37:30 -07:00

smack

Smack: include magic.h in smackfs.c

2013-04-03 13:13:51 +11: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

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

2013-04-30 16:27:51 -07:00

commoncap.c

kill f_vfsmnt

2013-02-26 02:46:10 -05:00

device_cgroup.c

devcg: remove parent_cgroup.

2013-04-18 11:34:35 -07: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

LSM: BUILD_BUG_ON if the common_audit_data union ever grows

2012-04-09 12:23:03 -04: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

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

2013-04-30 16:27:51 -07:00