From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 9 Sep 2018 12:54:05 +0000 (-0700)
Subject: Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
X-Git-Tag: v5.4.17~5237
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3243a89dcbd8f5810b72ee0903d349bd000c4c9d;p=arm%2Flinux.git

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random

Pull random driver fix from Ted Ts'o:
 "Fix things so the choice of whether or not to trust RDRAND to
  initialize the CRNG is configurable via the boot option
  random.trust_cpu={on,off}"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: make CPU trust a boot parameter
---

3243a89dcbd8f5810b72ee0903d349bd000c4c9d