Hi all,
On Fri, 4 Nov 2022 12:49:22 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.
This is now a conflict between the char-misc tree and the devicetree
tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpblj7NCxigE.pgp
Description: OpenPGP digital signature
