]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb98bf48cc7a3edacd6494f60fa375664b2046266
treee09278fdedc2dfdeb93ef2bc773d18205d34a74f
parentba723d325aebdf7360e9290cef365164dbea0a71
parentb09b272029a7a7a1184e53f5414c7e32f371e988
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/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