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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <87bjp3pawb.fsf@bootlin.com>
Date: Tue, 29 Jul 2025 12:08:20 +0200
From: Miquel Raynal <miquel.raynal@...tlin.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Mark Brown <broonie@...nel.org>,  Boris Brezillon
 <boris.brezillon@...labora.com>,  Gabor Juhos <j4g8y7@...il.com>,  Linux
 Kernel Mailing List <linux-kernel@...r.kernel.org>,  Linux Next Mailing
 List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the nand tree

Hello,

On 29/07/2025 at 10:38:16 +10, Stephen Rothwell <sfr@...b.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