linux-kernel - Re: linux-next: manual merge of the devicetree 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]

Date:   Tue, 15 Jun 2021 12:57:51 -0600
From:   Rob Herring <robherring2@...il.com>
To:     Miquel Raynal <miquel.raynal@...tlin.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Richard Weinberger <richard.weinberger@...il.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Vignesh Raghavendra <vigneshr@...com>
Subject: Re: linux-next: manual merge of the devicetree tree with the mtd tree

On Tue, Jun 15, 2021 at 10:47 AM Miquel Raynal
<miquel.raynal@...tlin.com> wrote:
>
> Hi Stephen,
>
> Stephen Rothwell <sfr@...b.auug.org.au> wrote on Tue, 15 Jun 2021
> 12:59:58 +1000:
>
> > Hi all,
> >
> > Today's linux-next merge of the devicetree tree got a conflict in:
> >
> >   Documentation/devicetree/bindings/mtd/ti,am654-hbmc.txt
> >
> > between commit:
> >
> >   6947ad674944 ("dt-bindings: mtd: Convert ti, am654-hbmc.txt to YAML schema")
> >
> > from the mtd tree and commit:
> >
> >   9b358af7c818 ("dt-bindings: mux: Convert mux controller bindings to schema")
> >
> > from the devicetree tree.
> >
> > I fixed it up (the latter removed the file, so I just did 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.
> >
>
> Thanks for the warning. Indeed the txt file being touched by
> 9b358af7c818 is being updated into a yaml file which does not reference
> the mux binding anymore.
>
> Rob, how do you want to proceed?

It shouldn't be an issue merging as taking the deleted file is simple
enough to resolve.

Rob