From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Apr 2018 04:20:48 +0000 (-0700)
Subject: Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=285848b0f4074f04ab606f1e5dca296482033d54;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'random_for_linus_stable' of git://git./linux/kernel/git/tytso/random

Pull /dev/random fixes from Ted Ts'o:
 "Fix some bugs in the /dev/random driver which causes getrandom(2) to
  unblock earlier than designed.

  Thanks to Jann Horn from Google's Project Zero for pointing this out
  to me"

* tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: add new ioctl RNDRESEEDCRNG
  random: crng_reseed() should lock the crng instance that it is modifying
  random: set up the NUMA crng instances after the CRNG is fully initialized
  random: use a different mixing algorithm for add_device_randomness()
  random: fix crng_ready() test
---

285848b0f4074f04ab606f1e5dca296482033d54