| commit | 9cfd403a7cee59aeb197ddb99eeca1bb590fee74 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 07 11:33:12 2018 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 07 11:33:12 2018 -0800 |
| tree | 64aa4039e55bfbc43768737842b8c1d6089516a3 | |
| parent | 9d61ec5baaf98e8aea271124a9c33bd11df8413b [diff] | |
| parent | 5b9f57cf47b87f07210875d6a24776b4496b818d [diff] |
Merge tag 'apparmor-pr-2018-01-07' of git://git.kernel.org/pub/scm/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