Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree

Miquel Raynal
2022-10-20T08:11:00Z

Hi Stephen,

sfr@canb.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@bootlin.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