On (Tue) 12 Aug 2014 [15:41:35], Greg KH wrote: > On Tue, Aug 12, 2014 at 12:36:54PM +0530, Amit Shah wrote: > > Instead of calling hwrng_register() in the probe routing, call it in the > > scan routine. This ensures that when hwrng_register() is successful, > > and it requests a few random bytes to seed the kernel's pool at init, > > we're ready to service that request. > > > > This will also enable us to remove the workaround added previously to > > check whether probe was completed, and only then ask for data from the > > host. The revert follows in the next commit. > > > > There's a slight behaviour change here on unsuccessful hwrng_register(). > > Previously, when hwrng_register() failed, the probe() routine would > > fail, and the vqs would be torn down, and driver would be marked not > > initialized. Now, the vqs will remain initialized, driver would be > > marked initialized as well, but won't be available in the list of RNGs > > available to hwrng core. To fix the failures, the procedure remains the > > same, i.e. unload and re-load the module, and hope things succeed the > > next time around. > > > > Signed-off-by: Amit Shah <amit.shah@xxxxxxxxxx> > > Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx> > > (cherry picked from commit 5c06273401f2eb7b290cadbae18ee00f8f65e893) > > Signed-off-by: Amit Shah <amit.shah@xxxxxxxxxx> > > > > Conflicts: > > drivers/char/hw_random/virtio-rng.c > > > > Context conflict due to not backporting two commits that changed > > struct layout. > > What is this "Conflicts:" stuff for? I don't need that... To note the patch didn't cherry-pick as-is; anyway, sent a v2 without that text. Thanks, Amit -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html