]> www.infradead.org Git - nvme.git/commitdiff
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)
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


Trivial merge