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:   Thu, 3 Aug 2023 09:22:45 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
        Santosh Shilimkar <ssantosh@kernel.org>,
        Shawn Guo <shawnguo@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Peng Fan <peng.fan@nxp.com>, Udit Kumar <u-kumar1@ti.com>
Subject: linux-next: manual merge of the ti tree with the imx-mxs tree
Message-ID: <20230803092245.4c0fc299@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Tu2vuV8DJFVY+E_42AY.OxX";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Tu2vuV8DJFVY+E_42AY.OxX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  b940e6846cf7 ("arm64: defconfig: select IMX_REMOTEPROC and RPMSG_VIRTIO")

from the imx-mxs tree and commit:

  8127ab5fbaee ("arm64: defconfig: Enable various configs for TI K3 platfor=
ms")

from the ti 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 arch/arm64/configs/defconfig
index 03fce1752521,700d5571f12b..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -938,8 -929,8 +943,9 @@@ CONFIG_SND_SOC_GTM601=3D
  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=3Dm
  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=3Dm
  CONFIG_SND_SOC_PCM3168A_I2C=3Dm
 +CONFIG_SND_SOC_RK817=3Dm
  CONFIG_SND_SOC_RT5640=3Dm
+ CONFIG_SND_SOC_J721E_EVM=3Dm
  CONFIG_SND_SOC_RT5659=3Dm
  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=3Dm
  CONFIG_SND_SOC_SIMPLE_MUX=3Dm
@@@ -1255,7 -1246,8 +1265,9 @@@ CONFIG_ARM_SMMU_V3=3D
  CONFIG_MTK_IOMMU=3Dy
  CONFIG_QCOM_IOMMU=3Dy
  CONFIG_REMOTEPROC=3Dy
 +CONFIG_IMX_REMOTEPROC=3Dy
+ CONFIG_TI_K3_R5_REMOTEPROC=3Dm
+ CONFIG_TI_K3_DSP_REMOTEPROC=3Dm
  CONFIG_MTK_SCP=3Dm
  CONFIG_QCOM_Q6V5_ADSP=3Dm
  CONFIG_QCOM_Q6V5_MSS=3Dm

--Sig_/Tu2vuV8DJFVY+E_42AY.OxX
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTK5UYACgkQAVBC80lX
0GzoRQgAiRfAOFYqze+KUqtVAAosm4u/4U9fFVu076q+jeJ/eegrdPjhjq9Y3l4J
rjBlslqu+YSiMIH69RrllOOxkpbUZnYOo7ddBZZUpXpICxqZ/I16+m7fM+fWsyjW
9N6uyTgnamLdKUFrl4SRzernmBRuAJOcdHrPvqJPXdz8bLbA5CEsCkwCiHG8YVe+
CFflxp98B4ujagcCMnUiCyksQIFLRCralVfnrdve9yyqF9RyFpBlLq/sIPSgl1EK
LbJpw04L60WeJO8SH+fDxx1YHvsY0RSrLxAKA3PAL+RFyt/fw/3ze5m1AnOvmeuy
ty5R1lB6DFNYjxexO29rmCWEKjKYMQ==
=kU2V
-----END PGP SIGNATURE-----

--Sig_/Tu2vuV8DJFVY+E_42AY.OxX--