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:   Mon, 28 Nov 2022 13:41:20 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Bjorn Andersson <bjorn.andersson@linaro.org>,
        Mathieu Poirier <mathieu.poirier@linaro.org>,
        Mark Brown <broonie@kernel.org>
Cc:     Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>,
        Ben Levinsky <ben.levinsky@amd.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Michal Simek <michal.simek@amd.com>,
        Rajan Vaja <rajan.vaja@xilinx.com>,
        Tanmay Shah <tanmay.shah@amd.com>
Subject: linux-next: manual merge of the rpmsg tree with the spi tree
Message-ID: <20221128134120.0afdceb3@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/QtuRcZtBKYOlx.6+a/hRLll";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/QtuRcZtBKYOlx.6+a/hRLll
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  include/linux/firmware/xlnx-zynqmp.h

between commit:

  1e400cb9cff2 ("firmware: xilinx: Add qspi firmware interface")

from the spi tree and commit:

  b2bd0a8c3ab1 ("firmware: xilinx: Add ZynqMP firmware ioctl enums for RPU =
configuration.")

from the rpmsg 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.

--=20
Cheers,
Stephen Rothwell

diff --cc include/linux/firmware/xlnx-zynqmp.h
index fac37680ffe7,cf92e739fa3b..000000000000
--- a/include/linux/firmware/xlnx-zynqmp.h
+++ b/include/linux/firmware/xlnx-zynqmp.h
@@@ -135,7 -138,10 +138,11 @@@ enum pm_ret_status=20
  };
 =20
  enum pm_ioctl_id {
+ 	IOCTL_GET_RPU_OPER_MODE =3D 0,
+ 	IOCTL_SET_RPU_OPER_MODE =3D 1,
+ 	IOCTL_RPU_BOOT_ADDR_CONFIG =3D 2,
+ 	IOCTL_TCM_COMB_CONFIG =3D 3,
 +	IOCTL_SET_TAPDELAY_BYPASS =3D 4,
  	IOCTL_SD_DLL_RESET =3D 6,
  	IOCTL_SET_SD_TAPDELAY =3D 7,
  	IOCTL_SET_PLL_FRAC_MODE =3D 8,

--Sig_/QtuRcZtBKYOlx.6+a/hRLll
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmOEH9AACgkQAVBC80lX
0GzmAQgAhe6QBjVQ7ZpYxc343NG9pptZCwVVyEzw7f3E2yhnlgxQ6F9bqEknWXX7
6fL2WFUIUFfyebNxdADiggyVQihLn7loEWXEoGyJbVdmMHE82VC2TETIyyUQdxfE
SqEkfPZte0+fJ7o5WgR60s1422dp51mmynWVVwinSOPHdopEJyjDy9ZuvKvvuHvM
2MdJuzNjfi55SBp26w6ab27twQSXqdE4575dQ2yAMH0HvGrPsA4OaZr5lURJ5d7o
W0DjRgPE+AXrLZd0mVARl7ELdikgQMa+Nt+Cz3sL/Le2VSXX9Z75dWGQHVxPDKl0
rpPDvP4bvx2eD2NL3iyKAhWOM2CgVg==
=n8zh
-----END PGP SIGNATURE-----

--Sig_/QtuRcZtBKYOlx.6+a/hRLll--