Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse source

Pull crypto fixes from Herbert Xu:
 "This push fixes a boot hang in virt guests when the virtio RNG is
  enabled"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  hwrng: virtio - ensure reads happen after successful probe
  hwrng: fetch randomness only after device init

...

This commit is contained in:

Linus Torvalds 2014-07-18 20:25:54 -10:00

parent f839719122 e052dbf554

commit 4e10627529

2 changed files with 49 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

47

drivers/char/hw_random/core.c

View file

10

drivers/char/hw_random/virtio-rng.c

View file