linux-kernel - Re: linux-next: manual merge of the nand tree with Linus' 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: <20190627165129.3b2c1264@xps13>
Date:   Thu, 27 Jun 2019 16:51:37 +0200
From:   Miquel Raynal <miquel.raynal@...tlin.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Boris Brezillon <boris.brezillon@...labora.com>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Kamal Dasu <kdasu.kdev@...il.com>,
        Rob Herring <robh@...nel.org>
Subject: Re: linux-next: manual merge of the nand tree with Linus' tree

Hi Stephen,

Stephen Rothwell <sfr@...b.auug.org.au> wrote on Tue, 4 Jun 2019
10:54:18 +1000:

> Hi all,
> 
> Today's linux-next merge of the nand tree got a conflict in:
> 
>   Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
> 
> between commit:
> 
>   a5f2246fb913 ("dt: bindings: mtd: replace references to nand.txt with nand-controller.yaml")
> 
> from Linus' tree and commit:
> 
>   33cc5bd0b87a ("dt-bindings: mtd: brcmnand: Make nand-ecc-strength and nand-ecc-step-size optional")
> 
> from the nand tree.
> 
> I fixed it up (the latter included the changes from the former, so I
> just used that) 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.
> 

Can you please share the fix? I might want to include it in the final
PR.


Thanks,
Miquèl