]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit01d33dbc6f4d68f7462ea29818a955ae90d9cdfe
tree94e1de33c91a97cfaf69aca949959397afa88c94
parent969da784bdada948c2a6b503137ead2be2dfb155
parent7144f1e4880722c2c1099cef9521d5d230160d56
Merge branch 'fixes-v4.18-rc3' of git://git.kernel.org/pub/scm/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