From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Jan 2018 19:33:12 +0000 (-0800)
Subject: Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.15-rc7~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9cfd403a7cee59aeb197ddb99eeca1bb590fee74;p=tomoyo%2Ftomoyo-test1.git

Merge tag 'apparmor-pr-2018-01-07' of git://git./linux/kernel/git/jj/linux-apparmor

Pull apparmor fix from John Johansen:
 "This fixes a regression when the kernel feature set is reported as
  supporting mount and policy is pinned to a feature set that does not
  support mount mediation"

* tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix regression in mount mediation when feature set is pinned
---

9cfd403a7cee59aeb197ddb99eeca1bb590fee74