From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Jan 2016 20:24:05 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.14-rc1~3913
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=704bb813c2202f140d6c364a1703b0265473218f;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull security layer fixes from James Morris:
 "The keys patch fixes a bug which is breaking kerberos, and the seccomp
  fix addresses a no_new_privs bypass"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set
  seccomp: always propagate NO_NEW_PRIVS on tsync
---

704bb813c2202f140d6c364a1703b0265473218f