]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
projects / mirror_ubuntu-kernels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf6879d d54d27c)
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2018 23:44:33 +0000 (16:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Apr 2018 23:44:33 +0000 (16:44 -0700)
Pull smack update from James Morris:
 "One small change for Automotive Grade Linux"

* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  Smack: Handle CGROUP2 in the same way that CGROUP

1  2 
security/smack/smack_lsm.c patch | diff1 | diff2 | blob | history

diff --cc security/smack/smack_lsm.c
Simple merge
Ubuntu combined Linux kernel mirror