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

[Stephen Rothwell]

Hi Jason,

On Thu, 7 Jul 2022 12:52:54 +0200 "Jason A. Donenfeld" <Jason@xxxxxxxxx> 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

Attachment: pgp8uew2kTK6J.pgp
Description: OpenPGP digital signature