linux-next: manual merge of the spi tree with the nand tree

Posted by Stephen Rothwell 2 months, 1 week ago

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)

Re: linux-next: manual merge of the spi tree with the nand tree

Posted by Miquel Raynal 2 months, 1 week ago

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

Re: linux-next: manual merge of the spi tree with the nand tree

Posted by Gabor Juhos 2 months, 1 week ago

Hi Miquel,

2025. 07. 29. 12:08 keltezéssel, Miquel Raynal írta:
> 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..

Sorry for the trouble, I will resend the patch once rc1 gets released.

Regards,
Gabor