Merge branch 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jun 2018 16:13:52 +0000 (09:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Jun 2018 16:13:52 +0000 (09:13 -0700)
commit896a349228c494aa65279ccfc41d2395898f6f4d
tree94e1de33c91a97cfaf69aca949959397afa88c94
parent3b41c3e28e9882760b78864487558b66aaa6261e
parent3619dec5103dd999a777e3e4ea08c8f40a6ddc57
Merge branch 'fixes-v4.18-rc3' of git://git./linux/kernel/git/jmorris/linux-security

Pull more security subsystem fixes from James Morris:
 "Two further fixes for the keys subsystem"

* 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  dh key: fix rounding up KDF output length
  certs/blacklist: fix const confusion