From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Nov 2018 23:03:24 +0000 (-0600)
Subject: Merge branch 'fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e4c4b0e45dfd1212831ad5bd129c6781d55e162a;p=linux.git

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
---

e4c4b0e45dfd1212831ad5bd129c6781d55e162a