projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 26cd836 1c1ecf1)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2016 20:24:05 +0000 (12:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Jan 2016 20:24:05 +0000 (12:24 -0800)
commit704bb813c2202f140d6c364a1703b0265473218f
treea731f413d12acb19710ae1908092c980a55658f3tree | snapshot
parent26cd83670f2f5a3d5b5514a1f7d96567cdb9558bcommit | diff
parent1c1ecf172a4616cd8567182b99efa7a5df77f5d2commit | diff
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
Linux 6.x block layer and io_uring tree(s)