linux-next: manual merge of the iommu tree with the arm-soc tree

[Mark Brown]

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  f54f7979ff88d ("arm64: defconfig: Move entries to match savedefconfig")

from the arm-soc tree and commit:

  187029b922d0e ("arm64: defconfig: enable Verisilicon IOMMU for Rockchip RK3588")

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

diff --cc arch/arm64/configs/defconfig
index 9f00e2823ccb6,2755960fce06a..0000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1587,22 -1608,23 +1587,23 @@@ CONFIG_RENESAS_OSTM=
  CONFIG_ARM_MHU=y
  CONFIG_EXYNOS_MBOX=m
  CONFIG_IMX_MBOX=y
 -CONFIG_OMAP2PLUS_MBOX=m
  CONFIG_PLATFORM_MHU=y
 +CONFIG_OMAP2PLUS_MBOX=m
  CONFIG_BCM2835_MBOX=y
  CONFIG_QCOM_APCS_IPC=y
 +CONFIG_TEGRA_HSP_MBOX=y
  CONFIG_MTK_ADSP_MBOX=m
  CONFIG_QCOM_CPUCP_MBOX=m
 -CONFIG_TEGRA_HSP_MBOX=y
  CONFIG_QCOM_IPCC=y
  CONFIG_CIX_MBOX=y
 -CONFIG_ROCKCHIP_IOMMU=y
 -CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_ARM_SMMU=y
  CONFIG_ARM_SMMU_V3=y
 -CONFIG_MTK_IOMMU=y
  CONFIG_QCOM_IOMMU=y
 +CONFIG_ROCKCHIP_IOMMU=y
 +CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_APPLE_DART=m
 +CONFIG_MTK_IOMMU=y
+ CONFIG_VSI_IOMMU=m
  CONFIG_REMOTEPROC=y
  CONFIG_IMX_REMOTEPROC=y
  CONFIG_MTK_SCP=m

Attachment: signature.asc
Description: PGP signature