From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 29 Jul 2018 02:40:06 +0000 (-0700)
Subject: Merge tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~8371
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a26fb01c2879ed7026e6cbd78bb701912d249eef;p=mirror_ubuntu-kernels.git

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

Pull random fixes from Ted Ts'o:
 "In reaction to the fixes to address CVE-2018-1108, some Linux
  distributions that have certain systemd versions in some cases
  combined with patches to libcrypt for FIPS/FEDRAMP compliance, have
  led to boot-time stalls for some hardware.

  The reaction by some distros and Linux sysadmins has been to install
  packages that try to do complicated things with the CPU and hope that
  leads to randomness.

  To mitigate this, if RDRAND is available, mix it into entropy provided
  by userspace. It won't hurt, and it will probably help"

* tag 'random_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
  random: mix rdrand with entropy sent in from userspace
---

a26fb01c2879ed7026e6cbd78bb701912d249eef