From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 Nov 2015 23:27:52 +0000 (-0800)
Subject: Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.4-rc3~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7e4b9359f483fe270c176cc37aaad54d5d1b6a1c;p=linux-2.6-block.git

Merge branch 'for-linus2' of git://git./linux/kernel/git/jmorris/linux-security

Pull security layer fixes from James Morris:
 "A fix for SELinux policy processing (regression introduced by
  commit fa1aa143ac4a: "selinux: extended permissions for ioctls"), as
  well as a fix for the user-triggerable oops in the Keys code"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix handling of stored error in a negatively instantiated user key
  selinux: fix bug in conditional rules handling
---

7e4b9359f483fe270c176cc37aaad54d5d1b6a1c