linux-next: manual merge of the random tree with the powerpc tree
Stephen Rothwell
sfr at canb.auug.org.au
Thu Jul 7 22:03:35 AEST 2022
Hi Jason,
On Thu, 7 Jul 2022 12:52:54 +0200 "Jason A. Donenfeld" <Jason at zx2c4.com> 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20220707/374c137b/attachment.sig>
More information about the Linuxppc-dev
mailing list