Hi Jason,
On Thu, 7 Jul 2022 12:52:54 +0200 "Jason A. Donenfeld" wrote:
>
> Oh darn. Any clever tricks to prevent the merge conflict from
> happening? Or is this trivial enough that we'll let Linus deal with
> it?
Just leave it for Linus, its pretty trivial.
--
Cheers,
Stephen Rothwell
pgpmV
Hi all,
Today's linux-next merge of the random tree got a conflict in:
arch/powerpc/Kconfig
between commit:
cea9d62b64c9 ("powerpc: Kconfig: Replace tabs with whitespaces")
from the powerpc tree and commit:
a2ff4b7600cd ("random: remove CONFIG_ARCH_RANDOM")
from the random tree.
I fix
