From: Linus Torvalds 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-Tag: v4.17-rc1~81 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=706ffc8c26432432fcd6d8a02708b40852bd0bd2;p=linux-platform-drivers-x86.git 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 --- 706ffc8c26432432fcd6d8a02708b40852bd0bd2