lkml.org 
[lkml]   [2022]   [Nov]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the iio tree with the devicetree tree
Hi all,

On Fri, 4 Nov 2022 12:49:22 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-11-28 03:50    [W:0.023 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site