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)
commit706ffc8c26432432fcd6d8a02708b40852bd0bd2
treee09278fdedc2dfdeb93ef2bc773d18205d34a74f
parentbf6879dcc483f0aa087afe27d103285daf435951
parentd54d27c9571245e4990bb8d020b109b92115683b
Merge branch 'next-smack' of git://git./linux/kernel/git/jmorris/linux-security

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
security/smack/smack_lsm.c