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:   Mon, 19 Jul 2021 09:51:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Joel Stanley <joel@jms.id.au>
Cc:     Andrew Jeffery <andrew@aj.id.au>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the aspeed tree with Linus' tree
Message-ID: <20210719095150.75af9e42@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ro4BWjf43q6JPonvY640F_Y";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

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

  arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

between commit:

  faffd1b2bde3 ("ARM: dts: everest: Add phase corrections for eMMC")

from Linus' tree and commit:

  315cc563d047 ("ARM: dts: everest: Add phase corrections for eMMC")

from the aspeed tree.

I fixed it up (I used the latter 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.

--=20
Cheers,
Stephen Rothwell

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmD0vpcACgkQAVBC80lX
0Gzcrgf/f1GSlrGEKKbhwhgHIb655Zuq0D7NnGyhHhbdz1V9iN9SgxFhw7VeDkcL
YbQq0hjmRkN4+JzqpMtP2H5ntw4f7YHRWPtBz0fOvcHoH0RjKNP7r24yJZkfxIdU
o3GW4Kog8J6hLdcoch1c2xX9GgqZHAwTFUXO4OuAEaRVHya3LmCBRUZxkDsexdKn
QOU3BSImVAlRtylCaJjiWiNG3kmyc3Qd0VIrHnf5aAf4z2NmocQHIZPxV1P/zbtb
JDKW984Q3eRGZTzulMEb3FBoSqJQBiX3JpSgp06+SgjHQl61HT84w51vXWMvCzfJ
JUhS0H/wRQQbDgpnj/QQPoRAwyCVrg==
=tjG9
-----END PGP SIGNATURE-----

--Sig_/ro4BWjf43q6JPonvY640F_Y--