[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Thu, 7 Jul 2022 22:03:35 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Jason A. Donenfeld" <Jason@...c4.com>
Cc: Michael Ellerman <mpe@...erman.id.au>,
PowerPC <linuxppc-dev@...ts.ozlabs.org>,
Juerg Haefliger <juerg.haefliger@...onical.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the random tree with the powerpc
tree
Hi Jason,
On Thu, 7 Jul 2022 12:52:54 +0200 "Jason A. Donenfeld" <Jason@...c4.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists