projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3472f66 fd35f19)
Merge branch 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2018 23:03:24 +0000 (17:03 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Nov 2018 23:03:24 +0000 (17:03 -0600)
Pull integrity fix from James Morris:
 "Fix a bug introduced with in this merge window in 82f94f24475c ("KEYS:
  Provide software public key query function [ver #2]")"

* 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  integrity: support new struct public_key_signature encoding field


Trivial merge
Linux 6.x block layer and io_uring tree(s)