linux-kernel - 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-next>] [day] [month] [year] [list]

Date:   Mon, 30 Oct 2017 12:22:00 +0000
From:   Mark Brown <broonie@...nel.org>
To:     robh@...nel.org, arnd@...db.de,
        Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Chen-Yu Tsai <wens@...e.org>
Cc:     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: linux-next: manual merge of the sunxi tree with the arm-soc tree

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.

diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
index b9b138a36686,b91300d49a31..000000000000
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
diff --cc arch/arm/boot/dts/sun6i-a31.dtsi
index ca46bd223ebb,8bfa12b548e0..000000000000
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
index 08bea4f5616d,228c368537a0..000000000000
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
diff --cc arch/arm/boot/dts/sunxi-h3-h5.dtsi
index f2dcf97a0d08,d7a71e726a9f..000000000000
--- a/arch/arm/boot/dts/sunxi-h3-h5.dtsi
+++ b/arch/arm/boot/dts/sunxi-h3-h5.dtsi

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)