Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 18 Feb 2021 14:48:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Rob Herring <robherring2@gmail.com>,
        Michael Ellerman <mpe@ellerman.id.au>,
        PowerPC <linuxppc-dev@lists.ozlabs.org>
Cc:     Hari Bathini <hbathini@linux.ibm.com>,
        Lakshmi Ramasubramanian <nramas@linux.microsoft.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Rob Herring <robh@kernel.org>
Subject: linux-next: manual merge of the devicetree tree with the powerpc
 tree
Message-ID: <20210218144815.5673ae6f@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/GQSo81TZbEJK8U/wnAHYYnY";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/GQSo81TZbEJK8U/wnAHYYnY
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the devicetree tree got a conflict in:

  arch/powerpc/kexec/elf_64.c

between commit:

  2377c92e37fe ("powerpc/kexec_file: fix FDT size estimation for kdump kern=
el")

from the powerpc tree and commit:

  130b2d59cec0 ("powerpc: Use common of_kexec_alloc_and_setup_fdt()")

from the devicetree tree.

I can't easily see how to resolve these, so for now I have just used
the latter' changes to this file.

I fixed it up 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.

--=20
Cheers,
Stephen Rothwell

--Sig_/GQSo81TZbEJK8U/wnAHYYnY
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmAt438ACgkQAVBC80lX
0Gw7PQf/a1d0NWQIgPhB7xouP3AzhGRerfWA6mMtdHA5mq8rTcHBuoBtwuXyLevF
KyiQvwpAXo5ETgcdKyJ2q+kzkNsDzo5fzJkKD1tzCX6x12rZcdd0GUWiIBXmMVwb
Gzst/oZMrxHsPqTlN8ubrGHqSzRGkMBBXamy4HuXdAAAq+E/C369jxbH/Kb/+sBs
jApDC8xPpOSc4xNqwPvtrObiuVvpJPovAHJkbb5eVpTHz6W5DhSBIFhM28mtZXwA
MRt2YnLiQqIDVFk2s/NG83Ig3YccPMb406Xt8TSwF2R/JDLOEEuPGfb5pYATU8zP
o7Ze4sqM31shYat0Cc3JYjgnUTwS7A==
=MsIt
-----END PGP SIGNATURE-----

--Sig_/GQSo81TZbEJK8U/wnAHYYnY--