projects / linux-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9abf231 96cb9d0)
Merge tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Oct 2022 17:20:04 +0000 (10:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Oct 2022 17:20:04 +0000 (10:20 -0700)
Pull crypto fix from Herbert Xu:
 "This fixes an issue exposed by the recent change to feed untrusted
  sources into /dev/random"

* tag 'v6.1-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: bcm2835 - use hwrng_msleep() instead of cpu_relax()


Trivial merge
Linux 6.x block layer and io_uring tree(s)