projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8d1a240 3d40658)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2016 23:27:41 +0000 (15:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Nov 2016 23:27:41 +0000 (15:27 -0800)
commit3b404a519815b9820f73f1ecf404e5546c9270ba
treeaaa2975ab06a0f6f24bf21906577f5f065c48d98tree | snapshot
parent8d1a2408efa6a5e75f4c968351a240425c3fa0e5commit | diff
parent3d40658c977769ce2138f286cf131537bf68bdfecommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull apparmor bugfix from James Morris:
 "This has a fix for a policy replacement bug that is fairly serious for
  apache mod_apparmor users, as it results in the wrong policy being
  applied on an network facing service"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  apparmor: fix change_hat not finding hat after policy replacement
John Crispins staging tree