From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@kernel•org>,
Miquel Raynal <miquel.raynal@bootlin•com>,
Boris Brezillon <boris.brezillon@collabora•com>
Cc: Gabor Juhos <j4g8y7@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the spi tree with the nand tree
Date: Tue, 29 Jul 2025 10:38:16 +1000 [thread overview]
Message-ID: <20250729103816.5354a528@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]
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.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/mtd/nand-qpic-common.h
index ed692d87be50,4e694b1aabbd..000000000000
--- a/include/linux/mtd/nand-qpic-common.h
+++ b/include/linux/mtd/nand-qpic-common.h
@@@ -92,8 -99,13 +92,10 @@@
/* NAND_DEV0_ECC_CFG bits */
#define ECC_CFG_ECC_DISABLE BIT(0)
#define ECC_SW_RESET BIT(1)
-#define ECC_MODE 4
#define ECC_MODE_MASK GENMASK(5, 4)
+ #define ECC_MODE_4BIT 0
+ #define ECC_MODE_8BIT 1
-#define ECC_PARITY_SIZE_BYTES_BCH 8
#define ECC_PARITY_SIZE_BYTES_BCH_MASK GENMASK(12, 8)
-#define ECC_NUM_DATA_BYTES 16
#define ECC_NUM_DATA_BYTES_MASK GENMASK(25, 16)
#define ECC_FORCE_CLK_OPEN BIT(30)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-07-29 0:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-29 0:38 Stephen Rothwell [this message]
2025-07-29 10:08 ` linux-next: manual merge of the spi tree with the nand tree Miquel Raynal
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=20250729103816.5354a528@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=boris.brezillon@collabora$(echo .)com \
--cc=broonie@kernel$(echo .)org \
--cc=j4g8y7@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miquel.raynal@bootlin$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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