Re: linux-next: manual merge of the sunxi tree with the arm-soc tree

[Arnd Bergmann]

On Mon, Oct 30, 2017 at 1:22 PM, Mark Brown <broonie@xxxxxxxxxx> wrote:
> Hi all,
>
> Today's linux-next merge of the sunxi tree got a conflict in:
>
>    arch/arm/boot/dts/sunxi-h3-h5.dtsi
>    arch/arm/boot/dts/sun7i-a20.dtsi
>    arch/arm/boot/dts/sun6i-a31.dtsi
>    arch/arm/boot/dts/sun4i-a10.dtsi
>
> between commit:
>
>    8dccafaa281aa1 ("arm: dts: fix unit-address leading 0s")
>
> from the arm-soc tree and various commits from the sunxi tree.
>
> I fixed it up (see below) 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!

I think I did the same merge when I pulled in the sunxi/dt branch
today, so it should be resolved next time.

      Arnd