Subject: linux-next: manual merge of the tegra tree with the qcom tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 10 Jul 2025 10:49:33 +1000

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  3871b51a6842 ("arm64: defconfig: Enable Qualcomm CPUCP mailbox driver")

from the qcom tree and commit:

  18c590e012d3 ("arm64: defconfig: Enable Tegra HSP and BPMP")

from the tegra 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 42b33f998149,cf3856dfed22..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1457,7 -1445,7 +1458,8 @@@ CONFIG_PLATFORM_MHU=
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
  CONFIG_MTK_ADSP_MBOX=m
 +CONFIG_QCOM_CPUCP_MBOX=m
+ CONFIG_TEGRA_HSP_MBOX=y
  CONFIG_QCOM_IPCC=y
  CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_SMMU=y