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

Message-ID: <20221104124922.499bdece@canb.auug.org.au>
Date:   Fri, 4 Nov 2022 12:49:22 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Jonathan Cameron <Jonathan.Cameron@...wei.com>,
        Rob Herring <robherring2@...il.com>
Cc:     Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Rob Herring <robh@...nel.org>
Subject: linux-next: manual merge of the iio tree with the devicetree tree

Hi all,

Today's linux-next merge of the iio tree got a conflict in:

  Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml

between commit:

  c9adc3bd1180 ("dt-bindings: Remove "status" from schema examples, again")

from the devicetree tree and commit:

  a4728fe6b58b ("dt-bindings: iio: addac: adi,ad74413r: improve example")

from the iio tree.

I fixed it up (I just used the latter whic included the former change
to this file) 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

Content of type "application/pgp-signature" skipped