From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Apr 2018 23:44:33 +0000 (-0700)
Subject: Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=706ffc8c26432432fcd6d8a02708b40852bd0bd2;p=openwrt%2Fstaging%2Fblogic.git

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
---

706ffc8c26432432fcd6d8a02708b40852bd0bd2