* [PATCH] arm64: defconfig: Fixup duplicated PCI_SKY1_HOST
@ 2026-05-21 15:30 Krzysztof Kozlowski
2026-05-21 15:46 ` Arnd Bergmann
0 siblings, 1 reply; 2+ messages in thread
From: Krzysztof Kozlowski @ 2026-05-21 15:30 UTC (permalink / raw)
To: Arnd Bergmann, Krzysztof Kozlowski, Alexandre Belloni,
Linus Walleij, Drew Fustini, linux-arm-kernel, soc, linux-kernel
Cc: Krzysztof Kozlowski, Peter Chen
Commit 246e37739f24 ("arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe
host, and Cadence GPIO") placed PCI_SKY1_HOST in wrong spot, thus it got
duplicated when merging with commit f54f7979ff88 ("arm64: defconfig:
Move entries to match savedefconfig").
Cc: Peter Chen <peter.chen@cixtech.com>
Fixes: 1440d446ad5d ("Merge tag 'cix-defconfig-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix into soc/defconfig")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
---
https://krzk.eu/#/builders/102/builds/72/steps/10/logs/warnings__1_
---
arch/arm64/configs/defconfig | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 340313d48e0f..03a057f90527 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -234,7 +234,6 @@ CONFIG_PCIE_XILINX_NWL=y
CONFIG_PCIE_XILINX_CPM=y
CONFIG_PCI_SKY1_HOST=m
CONFIG_PCI_J721E_HOST=m
-CONFIG_PCI_SKY1_HOST=m
CONFIG_PCI_IMX6_HOST=y
CONFIG_PCI_LAYERSCAPE=y
CONFIG_PCI_HISI=y
--
2.53.0
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] arm64: defconfig: Fixup duplicated PCI_SKY1_HOST
2026-05-21 15:30 [PATCH] arm64: defconfig: Fixup duplicated PCI_SKY1_HOST Krzysztof Kozlowski
@ 2026-05-21 15:46 ` Arnd Bergmann
0 siblings, 0 replies; 2+ messages in thread
From: Arnd Bergmann @ 2026-05-21 15:46 UTC (permalink / raw)
To: Krzysztof Kozlowski, Krzysztof Kozlowski, Alexandre Belloni,
Linus Walleij, Drew Fustini, linux-arm-kernel, soc, linux-kernel
Cc: Peter Chen
On Thu, May 21, 2026, at 17:30, Krzysztof Kozlowski wrote:
> Commit 246e37739f24 ("arm64: defconfig: Enable CIX Sky1 pinctrl, PCIe
> host, and Cadence GPIO") placed PCI_SKY1_HOST in wrong spot, thus it got
> duplicated when merging with commit f54f7979ff88 ("arm64: defconfig:
> Move entries to match savedefconfig").
>
> Cc: Peter Chen <peter.chen@cixtech.com>
> Fixes: 1440d446ad5d ("Merge tag 'cix-defconfig-v7.2-rc1' of
> git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix into
> soc/defconfig")
> Signed-off-by: Krzysztof Kozlowski
> <krzysztof.kozlowski@oss.qualcomm.com>
>
I've redone the merge and folded this in.
Arnd
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-21 15:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-05-21 15:30 [PATCH] arm64: defconfig: Fixup duplicated PCI_SKY1_HOST Krzysztof Kozlowski
2026-05-21 15:46 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®