linux-kernel - Re: linux-next: manual merge of the nand tree with the mtd 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] [day] [month] [year] [list]

Message-ID: <20230821092715.068a2666@xps-13>
Date:   Mon, 21 Aug 2023 09:27:15 +0200
From:   Miquel Raynal <miquel.raynal@...tlin.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Boris Brezillon <boris.brezillon@...labora.com>,
        Richard Weinberger <richard.weinberger@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Manivannan Sadhasivam <mani@...nel.org>,
        Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>,
        Rob Herring <robh@...nel.org>
Subject: Re: linux-next: manual merge of the nand tree with the mtd tree

Hi Stephen,

sfr@...b.auug.org.au wrote on Mon, 21 Aug 2023 11:55:07 +1000:

> Hi all,
> 
> Today's linux-next merge of the nand tree got a conflict in:
> 
>   drivers/mtd/nand/raw/qcom_nandc.c
> 
> between commit:
> 
>   c2fc6b694790 ("mtd: Explicitly include correct DT includes")
> 
> from the mtd tree and commit:
> 
>   93ca966b4a20 ("mtd: rawnand: qcom: Sort includes alphabetically")
> 
> from the nand 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.

Thanks for the warning, I'll handle it when merging nand/next into
mtd/next before sending to Linus.

Thanks,
Miquèl