Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 20 Sep 2022 05:19:05 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Conor Dooley <conor.dooley@microchip.com>
Cc:     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 risc-v-mc tree with Linus' tree
Message-ID: <20220920051905.500a52ce@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/HpRREwiX9JmKN_X_O3wxtYf";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

Hi all,

Today's linux-next merge of the risc-v-mc tree got a conflict in:

  arch/riscv/boot/dts/microchip/mpfs.dtsi

between commits:

  3f67e6997603 ("riscv: dts: microchip: mpfs: fix incorrect pcie child node=
 name")
  e4009c5fa77b ("riscv: dts: microchip: mpfs: remove pci axi address transl=
ation property")

from Linus' tree and commit:

  2ad0883d86c8 ("riscv: dts: microchip: move the mpfs' pci node to -fabric.=
dtsi")

from the risc-v-mc tree.

I fixed it up (the latter change seems to include the other 2) 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_/HpRREwiX9JmKN_X_O3wxtYf
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMowKkACgkQAVBC80lX
0Gz2Zwf/QYQJQ+WZRVyqa1QdqKIEdj0BYj1OEsYM2bV3V0jbx05HqcTp41k3lIQY
96ioFTnyYGlhMhNnw+zWK2qHaPmWL7Nx6H5xHzlG9pn+IeBSJ6tAEmmA95unWeAw
OG713x9ZEntfsWhrnXe5Peun00DhEAhA33ogS7T/OG5XzrI1Ql0mdgcOQGtzjkBy
9OAONGg15iTuctUEZhdBGwlTgUT+RIjpbpVDRq17roZAD60q7GXq1DnZkjqEpQck
43mhze5EScpbVBPZaNZCkBZ1fv6nnYrVkDDLQnsPEscnJ0hl6fCndtRu8JzHACik
CNygrJwj40XpCE4yYXg2fIbgCXfvUQ==
=U1tP
-----END PGP SIGNATURE-----

--Sig_/HpRREwiX9JmKN_X_O3wxtYf--