Hi all,
[I think I have reported this before ...]
Today's linux-next merge of the random tree got a conflict in:
include/linux/random.h
between commit:
022c204040f3 ("random,stackprotect: introduce get_random_canary function")
from Linus' tree and commit:
da9ba564bd68 ("random: add
Hi all,
[I think I have reported this before ...]
Today's linux-next merge of the random tree got a conflict in:
include/linux/random.h
between commit:
022c204040f3 ("random,stackprotect: introduce get_random_canary function")
from Linus' tree and commit:
da9ba564bd68 ("random: add
Hi Theodore,
Today's linux-next merge of the random tree got a conflict in
arch/x86/include/asm/archrandom.h between commit 5bfce5ef55cb ("x86,
kaslr: Provide randomness functions") from Linus' tree and commits
e3be36e60bdc ("x86, random: Enable the RDSEED instruction") and
91a60dc7aa88 ("random:
Hi Theodore,
Today's linux-next merge of the random tree got a conflict in
arch/x86/include/asm/archrandom.h between commit 5bfce5ef55cb (x86,
kaslr: Provide randomness functions) from Linus' tree and commits
e3be36e60bdc (x86, random: Enable the RDSEED instruction) and
91a60dc7aa88 (random: Add
On Mon, Nov 04, 2013 at 05:04:11PM +1100, Stephen Rothwell wrote:
> 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 to core files") from Linus' tree and commit
> f0ed2b943a53 ("random: use
On Mon, Nov 04, 2013 at 05:04:11PM +1100, Stephen Rothwell wrote:
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:
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 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
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
Hi Theodore,
Today's linux-next merge of the random tree got a conflict in init/main.c
between commit 65f382fd0c8f ("context_tracking: Ground setup for static
key use") from Linus' tree and commit 382521d2478b ("random: run
random_int_secret_init() run after all late_initcalls") from the random
Hi Theodore,
Today's linux-next merge of the random tree got a conflict in init/main.c
between commit 65f382fd0c8f (context_tracking: Ground setup for static
key use) from Linus' tree and commit 382521d2478b (random: run
random_int_secret_init() run after all late_initcalls) from the random
tree.
10 matches
Mail list logo