From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jun 2018 16:13:52 +0000 (-0700)
Subject: Merge branch 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorr... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=896a349228c494aa65279ccfc41d2395898f6f4d;p=openwrt%2Fstaging%2Fblogic.git

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

896a349228c494aa65279ccfc41d2395898f6f4d