tree aaa2975ab06a0f6f24bf21906577f5f065c48d98
parent 8d1a2408efa6a5e75f4c968351a240425c3fa0e5
parent 3d40658c977769ce2138f286cf131537bf68bdfe
author Linus Torvalds <torvalds@linux-foundation.org> 1479770861 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1479770861 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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