diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:21:00 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-12 13:21:00 -0700 | 
| commit | 7f85565a3f7194b966de71926471d69788b6b9c3 (patch) | |
| tree | 95f93ab1d18dc1121cd5ec71309c7e6cb4dedc7b /CREDITS | |
| parent | 680352bda57e3dbf21cddf6a5e23aff7e294fb31 (diff) | |
| parent | 0c3014f22dec0e1d14c8298551bfb6434638bdd9 (diff) | |
| download | linux-7f85565a3f7194b966de71926471d69788b6b9c3.tar.bz2 | |
Merge tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull selinux updates from Paul Moore:
 "A relatively quiet period for SELinux, 11 patches with only two/three
  having any substantive changes.
  These noteworthy changes include another tweak to the NNP/nosuid
  handling, per-file labeling for cgroups, and an object class fix for
  AF_UNIX/SOCK_RAW sockets; the rest of the changes are minor tweaks or
  administrative updates (Stephen's email update explains the file
  explosion in the diffstat).
  Everything passes the selinux-testsuite"
[ Also a couple of small patches from the security tree from Tetsuo
  Handa for Tomoyo and LSM cleanup. The separation of security policy
  updates wasn't all that clean - Linus ]
* tag 'selinux-pr-20170831' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: constify nf_hook_ops
  selinux: allow per-file labeling for cgroupfs
  lsm_audit: update my email address
  selinux: update my email address
  MAINTAINERS: update the NetLabel and Labeled Networking information
  selinux: use GFP_NOWAIT in the AVC kmem_caches
  selinux: Generalize support for NNP/nosuid SELinux domain transitions
  selinux: genheaders should fail if too many permissions are defined
  selinux: update the selinux info in MAINTAINERS
  credits: update Paul Moore's info
  selinux: Assign proper class to PF_UNIX/SOCK_RAW sockets
  tomoyo: Update URLs in Documentation/admin-guide/LSM/tomoyo.rst
  LSM: Remove security_task_create() hook.
Diffstat (limited to 'CREDITS')
| -rw-r--r-- | CREDITS | 8 | 
1 files changed, 3 insertions, 5 deletions
@@ -2606,11 +2606,9 @@ E: tmolina@cablespeed.com  D: bug fixes, documentation, minor hackery  N: Paul Moore -E: paul.moore@hp.com -D: NetLabel author -S: Hewlett-Packard -S: 110 Spit Brook Road -S: Nashua, NH 03062 +E: paul@paul-moore.com +W: http://www.paul-moore.com +D: NetLabel, SELinux, audit  N: James Morris  E: jmorris@namei.org  |