Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2018 18:56:06 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jan 2018 18:56:06 +0000 (10:56 -0800)
commitb4df268dd4031fd2f8729e7650bc516a0a5f315b
tree3de7a616b8e85704ef42e55a80c7f30be336e4eb
parente816c201aed5232171f8eb80b5d46ae6516683b9
parentdc32b5c3e6e2ef29cef76d9ce1b92d394446150e
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull capabilities fix from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  capabilities: fix buffer overread on very short xattr