David S. Miller 4dc6758d78 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Simple cases of overlapping changes in the packet scheduler.

Must easier to resolve this time.

Which probably means that I screwed it up somehow.

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

2017-11-10 10:00:18 +09:00

..

apparmor

apparmor: fix off-by-one comparison on MAXMAPPED_SIG

2017-11-08 10:56:22 -08:00

integrity

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

keys

Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2017-11-02 10:04:46 -07:00

loadpin

security: mark LSM hooks as __ro_after_init

2017-03-06 11:00:15 +11:00

selinux

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

2017-11-04 09:26:51 +09:00

smack

lsm: fix smack_inode_removexattr and xattr_getsecurity memleak

2017-10-04 18:03:15 +11:00

tomoyo

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

yama

doc: ReSTify Yama.txt

2017-05-18 10:33:04 -06:00

commoncap.c

commoncap: move assignment of fs_ns to avoid null pointer dereference

2017-10-19 13:09:33 +11:00

device_cgroup.c

device_cgroup: prepare code for bpf-based device controller

2017-11-05 23:26:51 +09:00

inode.c

securityfs: add the ability to support symlinks

2017-06-08 12:51:43 -07:00

Kconfig

include/linux/string.h: add the option of fortified string.h functions

2017-07-12 16:26:03 -07:00

lsm_audit.c

lsm_audit: update my email address

2017-08-17 15:33:39 -04:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

min_addr.c

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

security.c

security: bpf: Add LSM hooks for bpf object related syscall

2017-10-20 13:32:59 +01:00