linux-kernel - linux-next: manual merge of the ti tree with the imx-mxs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230803092245.4c0fc299@canb.auug.org.au>
Date:   Thu, 3 Aug 2023 09:22:45 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Nishanth Menon <nm@...com>, Tero Kristo <kristo@...nel.org>,
        Santosh Shilimkar <ssantosh@...nel.org>,
        Shawn Guo <shawnguo@...nel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Peng Fan <peng.fan@....com>, Udit Kumar <u-kumar1@...com>
Subject: linux-next: manual merge of the ti tree with the imx-mxs tree

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 platforms")

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.

-- 
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=
  CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
  CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
  CONFIG_SND_SOC_PCM3168A_I2C=m
 +CONFIG_SND_SOC_RK817=m
  CONFIG_SND_SOC_RT5640=m
+ CONFIG_SND_SOC_J721E_EVM=m
  CONFIG_SND_SOC_RT5659=m
  CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
  CONFIG_SND_SOC_SIMPLE_MUX=m
@@@ -1255,7 -1246,8 +1265,9 @@@ CONFIG_ARM_SMMU_V3=
  CONFIG_MTK_IOMMU=y
  CONFIG_QCOM_IOMMU=y
  CONFIG_REMOTEPROC=y
 +CONFIG_IMX_REMOTEPROC=y
+ CONFIG_TI_K3_R5_REMOTEPROC=m
+ CONFIG_TI_K3_DSP_REMOTEPROC=m
  CONFIG_MTK_SCP=m
  CONFIG_QCOM_Q6V5_ADSP=m
  CONFIG_QCOM_Q6V5_MSS=m

Content of type "application/pgp-signature" skipped