projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b41c3e 3619dec)
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)
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


Trivial merge
John Crispins staging tree