linux-kernel - linux-next: manual merge of the samsung-krzk 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>] [day] [month] [year] [list]

Message-ID: <20220201095338.1f3fc49f@canb.auug.org.au>
Date:   Tue, 1 Feb 2022 09:53:38 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Krzysztof Kozlowski <krzk@...nel.org>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Krzysztof Kozlowski <krzysztof.kozlowski@...onical.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Sam Protsenko <semen.protsenko@...aro.org>
Subject: linux-next: manual merge of the samsung-krzk tree with the arm-soc
 tree

Hi all,

Today's linux-next merge of the samsung-krzk tree got conflicts in:

  arch/arm64/boot/dts/exynos/exynos850-pinctrl.dtsi
  arch/arm64/boot/dts/exynos/exynos850.dtsi

between commit:

  e3493220fd3e ("arm64: dts: exynos: Add initial Exynos850 SoC support")

from the arm-soc tree and commit:

  bfb3c7fa3950 ("arm64: dts: exynos: Add initial Exynos850 SoC support")

from the samsung-krzk tree.

I fixed it up (I just used the latter, more recent, version) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped