From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>,
Boris Brezillon <boris.brezillon@collabora.com>,
Gabor Juhos <j4g8y7@gmail.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 spi tree with the nand tree
Date: Tue, 29 Jul 2025 12:08:20 +0200 [thread overview]
Message-ID: <87bjp3pawb.fsf@bootlin.com> (raw)
In-Reply-To: <20250729103816.5354a528@canb.auug.org.au> (Stephen Rothwell's message of "Tue, 29 Jul 2025 10:38:16 +1000")
Hello,
On 29/07/2025 at 10:38:16 +10, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> include/linux/mtd/nand-qpic-common.h
>
> between commit:
>
> 8e37aaf97153 ("mtd: nand: qpic-common: remove a bunch of unused defines")
>
> from the nand tree and commit:
>
> 0dc7e656ddd5 ("mtd: nand: qpic-common: add defines for ECC_MODE values")
>
> from the spi tree.
Indeed, I forgot about this change which conflicts. I'll drop the patch
from my tree, it is not urgent anyway. Gabor, please resend after a
rebase at -rc1, sorry for the extra work..
Thanks,
Miquèl
next prev parent reply other threads:[~2025-07-29 10:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 0:38 linux-next: manual merge of the spi tree with the nand tree Stephen Rothwell
2025-07-29 10:08 ` Miquel Raynal [this message]
2025-07-30 7:07 ` Gabor Juhos
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=87bjp3pawb.fsf@bootlin.com \
--to=miquel.raynal@bootlin.com \
--cc=boris.brezillon@collabora.com \
--cc=broonie@kernel.org \
--cc=j4g8y7@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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.