From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Rafał Miłecki" <rafal@milecki.pl>,
"Richard Weinberger" <richard.weinberger@gmail.com>,
"Boris Brezillon" <boris.brezillon@collabora.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the mtd tree with the mtd-fixes tree
Date: Thu, 20 Oct 2022 10:10:36 +0200 [thread overview]
Message-ID: <20221020101036.6ebecc75@xps-13> (raw)
In-Reply-To: <20221020010629.3e6e3d03@oak.ozlabs.ibm.com>
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
prev parent reply other threads:[~2022-10-20 8:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 22:28 linux-next: manual merge of the mtd tree with the mtd-fixes tree Stephen Rothwell
2022-10-19 5:31 ` Rafał Miłecki
2022-10-19 7:08 ` Stephen Rothwell
2022-10-19 13:49 ` Miquel Raynal
2022-10-19 14:06 ` Stephen Rothwell
2022-10-20 8:10 ` Miquel Raynal [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221020101036.6ebecc75@xps-13 \
--to=miquel.raynal@bootlin.com \
--cc=boris.brezillon@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rafal@milecki.pl \
--cc=richard.weinberger@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.