From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Nov 2016 23:27:41 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.14-rc1~2057
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b404a519815b9820f73f1ecf404e5546c9270ba;p=platform%2Fkernel%2Flinux-rpi.git

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
---

3b404a519815b9820f73f1ecf404e5546c9270ba