From: Mark Brown <broonie@kernel.org>
To: Michal Simek <monstr@monstr.eu>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Michael Walle <mwalle@kernel.org>,
Michal Simek <michal.simek@amd.com>, Nishanth Menon <nm@ti.com>
Subject: linux-next: manual merge of the xilinx tree with the ti tree
Date: Mon, 19 Jan 2026 15:14:53 +0000 [thread overview]
Message-ID: <aW5KbYimWKx7obE9@sirena.org.uk> (raw)
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
next reply other threads:[~2026-01-19 15:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-19 15:14 Mark Brown [this message]
2026-01-19 15:17 ` linux-next: manual merge of the xilinx tree with the ti tree Michal Simek
2026-01-19 15:21 ` Mark Brown
2026-01-20 12:23 ` Nishanth Menon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aW5KbYimWKx7obE9@sirena.org.uk \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michal.simek@amd.com \
--cc=monstr@monstr.eu \
--cc=mwalle@kernel.org \
--cc=nm@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox