Greg Kroah-Hartman b6a09416e8 Merge 4.15-rc6 into char-misc-next ...

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2018-01-02 14:46:35 +01:00

..

apparmor

Merge tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

2017-11-30 18:56:41 -05:00

integrity

ima: do not update security.ima if appraisal status is not INTEGRITY_PASS

2017-11-20 08:23:10 +11:00

keys

KEYS: reject NULL restriction string when type is specified

2017-12-08 15:13:29 +00:00

loadpin

…

selinux

Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

2017-11-15 13:32:56 -08:00

smack

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

2017-11-13 10:30:44 -08:00

tomoyo

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

2017-11-13 10:30:44 -08:00

yama

…

commoncap.c

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

2017-11-13 10:30:44 -08:00

device_cgroup.c

device_cgroup: prepare code for bpf-based device controller

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

inode.c

…

Kconfig

Merge 4.15-rc6 into char-misc-next

2018-01-02 14:46:35 +01: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