From: Jean Delvare <jdelvare@suse.de>
To: Miquel Raynal <miquel.raynal@bootlin.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Boris Brezillon <boris.brezillon@collabora.com>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
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 nand tree with the mtd-fixes tree
Date: Fri, 25 Nov 2022 13:58:41 +0100 [thread overview]
Message-ID: <20221125135841.134310ba@endymion.delvare> (raw)
In-Reply-To: <20221125100504.5424c3ad@xps-13>
On Fri, 25 Nov 2022 10:05:04 +0100, Miquel Raynal wrote:
> sfr@canb.auug.org.au wrote on Fri, 25 Nov 2022 09:46:34 +1100:
> > Today's linux-next merge of the nand tree got a conflict in:
> >
> > drivers/mtd/nand/onenand/Kconfig
> >
> > between commit:
> >
> > c717b9b7d6de ("mtd: onenand: omap2: add dependency on GPMC")
> >
> > from the mtd-fixes tree and commit:
> >
> > b46ff0780f17 ("mtd: onenand: omap2: Drop obsolete dependency on COMPILE_TEST")
>
> As this commit is not super urgent and because I want to make the merge
> process as smooth as possible, I'll drop it from my branches. Please
> rebase and resend when -rc1 is out and I'll apply right away.
Noted, no problem.
--
Jean Delvare
SUSE L3 Support
prev parent reply other threads:[~2022-11-25 12:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-24 22:46 linux-next: manual merge of the nand tree with the mtd-fixes tree Stephen Rothwell
2022-11-25 9:05 ` Miquel Raynal
2022-11-25 12:58 ` Jean Delvare [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=20221125135841.134310ba@endymion.delvare \
--to=jdelvare@suse.de \
--cc=boris.brezillon@collabora.com \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=miquel.raynal@bootlin.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox