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)
commite4c4b0e45dfd1212831ad5bd129c6781d55e162a
tree257381322eb2d6496e57e29cd02bc3cc3fa25e7a
parent3472f66013d1972f0baf1631ea1e02479b902579
parentfd35f192e42cf7c0df1e2480bfd5965e35b2f4ca
Merge branch 'fixes-v4.20-rc3' of git://git./linux/kernel/git/jmorris/linux-security

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