projects / linux-2.6-block.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d60d61f bf4407f)
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:33:22 +0000 (16:33 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 May 2018 21:33:22 +0000 (16:33 -0500)
commitc462f16b1a319991c59747e65837924a5ff17755
tree67423e1295a1d7c7b7183c9279d75ba2852a4bdetree | snapshot
parentd60d61f36b8f8d3f67c3fe49ee35cfd54b3bc49bcommit | diff
parentbf4407f081f33466ef0b06e213c04264d356aa35commit | diff
Merge branch 'linus' of git://git./linux/kernel/git/herbert/crypto-2.6

Pull crypto fix from Herbert Xu:
 "This fixes a potential kernel panic in the inside-secure driver"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: inside-secure - do not use memset on MMIO
Linux 6.x block layer and io_uring tree(s)