[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20221020101036.6ebecc75@xps-13>
Date: Thu, 20 Oct 2022 10:10:36 +0200
From: Miquel Raynal <miquel.raynal@...tlin.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Rafał Miłecki <rafal@...ecki.pl>,
Richard Weinberger <richard.weinberger@...il.com>,
Boris Brezillon <boris.brezillon@...labora.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 mtd tree with the mtd-fixes
tree
Hi Stephen,
sfr@...b.auug.org.au wrote on Thu, 20 Oct 2022 01:06:47 +1100:
> Hi Miquel,
>
> On Wed, 19 Oct 2022 15:49:07 +0200 Miquel Raynal <miquel.raynal@...tlin.com> wrote:
> >
> > Thanks Rafał for the right resolution and Stephen for carrying the fix.
> > I'll send the fixes PR soon and rebase on top of an -rc containing it
> > to avoid this conflict resolution to be needed when sending the final
> > PR to Linus during the next MW.
>
> Why not just merge your mtd/fixes branch into your mtd/branch (rather
> than rebasing)?
>
Yes, actually I usually wait for the next -rc and merge Linus' tag.
Thanks,
Miquèl
Powered by blists - more mailing lists