linux-next: manual merge of the random tree with Linus' tree

[Stephen Rothwell]

Hi Ted,

Today's linux-next merge of the random tree got a conflict in
drivers/base/core.c between commit 63967685605b ("driver core: add
#include <linux/sysfs.h> to core files") from Linus' tree and commit
f0ed2b943a53 ("random: use device attach events for entropy") from the
random tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/base/core.c
index 67b180d855b2,5e98fc379d0f..000000000000
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@@ -26,7 -26,7 +26,8 @@@
  #include <linux/async.h>
  #include <linux/pm_runtime.h>
  #include <linux/netdevice.h>
 +#include <linux/sysfs.h>
+ #include <linux/random.h>
  
  #include "base.h"
  #include "power/power.h"

Attachment: pgp00000.pgp
Description: PGP signature