linux-kernel - Re: linux-next: manual merge of the sunxi tree with the arm-soc 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]

Message-ID: <CAK8P3a12bGTr1-royZZeuu69kD+59MhVZeJJ-8iVviGg33hA-w@mail.gmail.com>
Date:   Mon, 30 Oct 2017 14:51:13 +0100
From:   Arnd Bergmann <arnd@...db.de>
To:     Mark Brown <broonie@...nel.org>
Cc:     Rob Herring <robh@...nel.org>,
        Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Chen-Yu Tsai <wens@...e.org>,
        Linux ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the sunxi tree with the arm-soc tree

On Mon, Oct 30, 2017 at 1:22 PM, Mark Brown <broonie@...nel.org> 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