linux-next: manual merge of the random tree with the powerpc tree

[Jason A. Donenfeld]

Hi Stephen,

On Thu, Jul 7, 2022 at 9:36 AM Stephen Rothwell <sfr at canb.auug.org.au> wrote:
>
> 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 fixed it up (the latter removed some lines updated by the former) and
> can carry the fix as necessary. This is now fixed as far as linux-next
> is concerned, but any non trivial conflicts should be mentioned to your
> upstream maintainer when your tree is submitted for merging.  You may
> also want to consider cooperating with the maintainer of the conflicting
> tree to minimise any particularly complex conflicts.

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?

Jason