Hi Theodore,
Today's linux-next merge of the random tree got a conflict in:
drivers/char/random.c
between commit:
8c6a68e9eaa5 ("latent_entropy: Mark functions with __latent_entropy")
from the kspp tree and commit:
e192be9d9a30 ("random: replace non-blocking pool with a Chacha20-based
Hi Theodore,
Today's linux-next merge of the random tree got a conflict in:
drivers/char/random.c
between commit:
8c6a68e9eaa5 ("latent_entropy: Mark functions with __latent_entropy")
from the kspp tree and commit:
e192be9d9a30 ("random: replace non-blocking pool with a Chacha20-based
2 matches
Mail list logo