linux-next: manual merge of the xilinx tree with the ti tree

[Mark Brown]

Hi all,

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

  arch/arm64/configs/defconfig

between commit:

  f69f88211c84d ("arm64: defconfig: Enable the J721E PCI host driver")

from the ti tree and commit:

  41de0de8033e7 ("arm64: defconfig: Enable missing AMD/Xilinx drivers")

from the xilinx 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 c46c678c8f6c2,cdb7d69e3b248..0000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -233,10 -231,12 +233,14 @@@ CONFIG_PCIE_MEDIATEK_GEN3=
  CONFIG_PCI_TEGRA=y
  CONFIG_PCIE_RCAR_HOST=y
  CONFIG_PCIE_RCAR_EP=y
 +CONFIG_PCIE_RENESAS_RZG3S_HOST=y
  CONFIG_PCIE_ROCKCHIP_HOST=m
  CONFIG_PCI_XGENE=y
 +CONFIG_PCI_J721E_HOST=m
+ CONFIG_PCIE_XILINX=y
+ CONFIG_PCIE_XILINX_DMA_PL=y
+ CONFIG_PCIE_XILINX_NWL=y
+ CONFIG_PCIE_XILINX_CPM=y
  CONFIG_PCI_IMX6_HOST=y
  CONFIG_PCI_LAYERSCAPE=y
  CONFIG_PCI_HISI=y
@@@ -608,11 -609,11 +618,13 @@@ CONFIG_SPI_STM32_OSPI=
  CONFIG_SPI_SUN6I=y
  CONFIG_SPI_TEGRA210_QUAD=m
  CONFIG_SPI_TEGRA114=m
+ CONFIG_SPI_XILINX=m
+ CONFIG_SPI_ZYNQMP_GQSPI=m
  CONFIG_SPI_SPIDEV=m
  CONFIG_SPMI=y
 +CONFIG_SPMI_APPLE=m
  CONFIG_SPMI_MTK_PMIF=m
 +CONFIG_PINCTRL_APPLE_GPIO=m
  CONFIG_PINCTRL_BRCMSTB=y
  CONFIG_PINCTRL_BCM2712=y
  CONFIG_PINCTRL_DA9062=m