From: Sasha Levin Date: Thu, 19 Aug 2021 13:26:05 +0000 (-0400) Subject: Drop arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch X-Git-Tag: v5.13.13~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0e779c207e69cff75b72ea398ff2c39f8e1191f;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index bbcfe16eb75..00000000000 --- a/queue-4.14/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 9c5c660bbc401a6b042a98a8d94a635ed71e198a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index c342dc4e8a45..2489b6151ace 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -76,6 +76,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-4.14/series b/queue-4.14/series index 4054bace2b0..174b0b9505b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -43,5 +43,4 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch scsi-core-avoid-printing-an-error-if-target_alloc-re.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch diff --git a/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 2d5786d968c..00000000000 --- a/queue-4.19/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 54964ecc4104980c371d55381a2337b9075e0725 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index c342dc4e8a45..2489b6151ace 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -76,6 +76,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 25c78324999..69f25e03ede 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -55,5 +55,4 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch scsi-core-avoid-printing-an-error-if-target_alloc-re.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch diff --git a/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 5078bc03fbf..00000000000 --- a/queue-4.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b9812a8aa6eed8ec79440014fbef6f4e1e2c2f83 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index c342dc4e8a45..2489b6151ace 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -76,6 +76,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-4.4/series b/queue-4.4/series index a7a990f0fd4..21f852abeaa 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -18,4 +18,3 @@ arm-dts-am43x-epos-evm-reduce-i2c0-bus-speed-for-tps.patch dmaengine-of-dma-router_xlate-to-return-eprobe_defer.patch scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch scsi-core-avoid-printing-an-error-if-target_alloc-re.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch diff --git a/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 1209db0ba24..00000000000 --- a/queue-4.9/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bf9b73c958cd29d651bd93d88c2665f9dd7f2201 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index c342dc4e8a45..2489b6151ace 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -76,6 +76,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-4.9/series b/queue-4.9/series index 76448f5573c..9a48f9070e3 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -27,4 +27,3 @@ scsi-megaraid_mm-fix-end-of-loop-tests-for-list_for_.patch scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch scsi-core-avoid-printing-an-error-if-target_alloc-re.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch diff --git a/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 15cf471a604..00000000000 --- a/queue-5.10/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 5f942aaca9991ec74fa82248f34703641681ef7d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index 165c184801e1..57e61e797189 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -89,6 +89,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 52deaf73ccf..311817d36bc 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -28,7 +28,6 @@ scsi-core-fix-capacity-set-to-zero-after-offlinining.patch drm-amdgpu-fix-the-doorbell-missing-when-in-cgpg-iss.patch qede-fix-crash-in-rmmod-qede-while-automatic-debug-c.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch net-usb-pegasus-check-the-return-value-of-get_gerist.patch net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch drm-amd-display-fix-dynamic-bpp-issue-with-8k30-with.patch diff --git a/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 9fc61239318..00000000000 --- a/queue-5.13/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 80dbc63aa6264ab8d9274381973ddb6beb243c1f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index 165c184801e1..57e61e797189 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -89,6 +89,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-5.13/series b/queue-5.13/series index fa5860946f6..44e3c1ac381 100644 --- a/queue-5.13/series +++ b/queue-5.13/series @@ -16,7 +16,6 @@ scsi-core-fix-capacity-set-to-zero-after-offlinining.patch drm-amdgpu-fix-the-doorbell-missing-when-in-cgpg-iss.patch qede-fix-crash-in-rmmod-qede-while-automatic-debug-c.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch net-usb-pegasus-check-the-return-value-of-get_gerist.patch net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch perf-x86-fix-out-of-bound-msr-access.patch diff --git a/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch b/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch deleted file mode 100644 index 2d54bc552d1..00000000000 --- a/queue-5.4/arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 61635a65ff62933ccabf54a6fb19280e9307f268 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 21 Jul 2021 17:16:04 +0200 -Subject: ARM: ixp4xx: goramo_mlr depends on old PCI driver - -From: Arnd Bergmann - -[ Upstream commit 796a8c85b1216618258e08b463d3bef0d7123760 ] - -When this driver is disabled, the board file fails to build, -so add a dependency: - -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_preinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:472:9: error: implicit declaration of function 'ixp4xx_pci_preinit'; did you mean 'iop3xx_pci_preinit'? [-Werror=implicit-function-declaration] - 472 | ixp4xx_pci_preinit(); - | ^~~~~~~~~~~~~~~~~~ - | iop3xx_pci_preinit -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_pci_postinit': -arch/arm/mach-ixp4xx/goramo_mlr.c:481:22: error: implicit declaration of function 'ixp4xx_pci_read' [-Werror=implicit-function-declaration] - 481 | if (!ixp4xx_pci_read(addr, NP_CMD_CONFIGREAD, &value)) { - | ^~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c:231:35: error: 'IXP4XX_UART1_BASE_PHYS' undeclared here (not in a function) - 231 | .start = IXP4XX_UART1_BASE_PHYS, - | ^~~~~~~~~~~~~~~~~~~~~~ -arch/arm/mach-ixp4xx/goramo_mlr.c: In function 'gmlr_init': -arch/arm/mach-ixp4xx/goramo_mlr.c:376:9: error: implicit declaration of function 'ixp4xx_sys_init' [-Werror=implicit-function-declaration] - 376 | ixp4xx_sys_init(); - | ^~~~~~~~~~~~~~~ - -Signed-off-by: Arnd Bergmann -Reviewed-by: Linus Walleij -Cc: Linus Walleij -Cc: soc@kernel.org -Link: https://lore.kernel.org/r/20210721151620.2373500-1-arnd@kernel.org' -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/mach-ixp4xx/Kconfig | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig -index 165c184801e1..57e61e797189 100644 ---- a/arch/arm/mach-ixp4xx/Kconfig -+++ b/arch/arm/mach-ixp4xx/Kconfig -@@ -89,6 +89,7 @@ config MACH_IXDP465 - - config MACH_GORAMO_MLR - bool "GORAMO Multi Link Router" -+ depends on IXP4XX_PCI_LEGACY - help - Say 'Y' here if you want your kernel to support GORAMO - MultiLink router. --- -2.30.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 86c76ba5fbb..32433270755 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -20,6 +20,5 @@ scsi-scsi_dh_rdac-avoid-crash-during-rdac_bus_attach.patch scsi-core-avoid-printing-an-error-if-target_alloc-re.patch scsi-core-fix-capacity-set-to-zero-after-offlinining.patch arm-dts-nomadik-fix-up-interrupt-controller-node-nam.patch -arm-ixp4xx-goramo_mlr-depends-on-old-pci-driver.patch net-usb-lan78xx-don-t-modify-phy_device-state-concur.patch drm-amd-display-fix-dynamic-bpp-issue-with-8k30-with.patch