Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Dec 2015 18:35:19 +0000 (10:35 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Dec 2015 18:35:19 +0000 (10:35 -0800)
commit2c7143d4f5cd5c31c7ebe7aa57b273145cdb1808
treed19593b70eb85028aa244cb02675bbbf09aa16e1
parent74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6
parentb4a1b4f5047e4f54e194681125c74c0aa64d637d
Merge branch 'for-linus2' of git://git./linux/kernel/git/jmorris/linux-security

Pull key handling bugfix from James Morris:
 "Fix a race between keyctl_read() and keyctl_revoke()"

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  KEYS: Fix race between read and revoke