projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d61ec5 5b9f57c)
Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jan 2018 19:33:12 +0000 (11:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Jan 2018 19:33:12 +0000 (11:33 -0800)
commit9cfd403a7cee59aeb197ddb99eeca1bb590fee74
tree64aa4039e55bfbc43768737842b8c1d6089516a3tree | snapshot
parent9d61ec5baaf98e8aea271124a9c33bd11df8413bcommit | diff
parent5b9f57cf47b87f07210875d6a24776b4496b818dcommit | diff
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
John Crispins staging tree