From: Greg Kroah-Hartman Date: Thu, 20 Oct 2022 11:47:24 +0000 (+0200) Subject: drop arm-orion-fix-include-path.patch from everywhere except 6.0 X-Git-Tag: v6.0.3~8 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c218e870ed9e8af4334e6a538c104ed39d06314;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-orion-fix-include-path.patch from everywhere except 6.0 --- diff --git a/queue-4.14/arm-orion-fix-include-path.patch b/queue-4.14/arm-orion-fix-include-path.patch deleted file mode 100644 index 51cab8ae8c9..00000000000 --- a/queue-4.14/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea27a569be8dda51674b1c3b7c40d5f7505bdb79 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 9433605cd290..06c3530d8ad5 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -1,7 +1,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index d72d766c87d..12b9ed4071c 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -192,7 +192,6 @@ arm-dts-imx6q-add-missing-properties-for-sram.patch arm-dts-imx6dl-add-missing-properties-for-sram.patch arm-dts-imx6qp-add-missing-properties-for-sram.patch arm-dts-imx6sl-add-missing-properties-for-sram.patch -arm-orion-fix-include-path.patch media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch nbd-fix-hung-when-signal-interrupts-nbd_start_device.patch diff --git a/queue-4.19/arm-orion-fix-include-path.patch b/queue-4.19/arm-orion-fix-include-path.patch deleted file mode 100644 index dd14ae03455..00000000000 --- a/queue-4.19/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0b5fe8b835971b96e0c0097d317e9e1b472b835a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 9433605cd290..06c3530d8ad5 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -1,7 +1,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 2eaaffb2b54..657c5cc3b28 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -208,7 +208,6 @@ arm-dts-imx6qp-add-missing-properties-for-sram.patch arm-dts-imx6sl-add-missing-properties-for-sram.patch arm-dts-imx6sll-add-missing-properties-for-sram.patch arm-dts-imx6sx-add-missing-properties-for-sram.patch -arm-orion-fix-include-path.patch arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch selftests-cpu-hotplug-use-return-instead-of-exit.patch media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch diff --git a/queue-4.9/arm-orion-fix-include-path.patch b/queue-4.9/arm-orion-fix-include-path.patch deleted file mode 100644 index 0f08e5f37a4..00000000000 --- a/queue-4.9/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4d516ecb23b8fac03311b18320f507a30db718e4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 9433605cd290..06c3530d8ad5 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -1,7 +1,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 3e280e40471..3e04b4ac6fb 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -144,7 +144,6 @@ arm-dts-imx6q-add-missing-properties-for-sram.patch arm-dts-imx6dl-add-missing-properties-for-sram.patch arm-dts-imx6qp-add-missing-properties-for-sram.patch arm-dts-imx6sl-add-missing-properties-for-sram.patch -arm-orion-fix-include-path.patch media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch hid-topre-add-driver-fixing-report-descriptor.patch diff --git a/queue-5.10/arm-orion-fix-include-path.patch b/queue-5.10/arm-orion-fix-include-path.patch deleted file mode 100644 index 737887eb4c3..00000000000 --- a/queue-5.10/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 552f40f6f625268de16d6aa070d515afd167d003 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 4e3f25de13c1..830b0be038c6 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -2,7 +2,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 2fa340b3df6..dd484846166 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -382,7 +382,6 @@ arm-dts-imx6sll-add-missing-properties-for-sram.patch arm-dts-imx6sx-add-missing-properties-for-sram.patch kselftest-arm64-fix-validatation-termination-record-.patch arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch -arm-orion-fix-include-path.patch btrfs-scrub-try-to-fix-super-block-errors.patch arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch selftests-cpu-hotplug-use-return-instead-of-exit.patch diff --git a/queue-5.15/arm-orion-fix-include-path.patch b/queue-5.15/arm-orion-fix-include-path.patch deleted file mode 100644 index 90464cc2dbb..00000000000 --- a/queue-5.15/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From daccf502c8feda9f70fcd8de3301b7950479aa83 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 4e3f25de13c1..830b0be038c6 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -2,7 +2,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index cdb0b8174c6..03b52a857ff 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -509,7 +509,6 @@ arm-dts-imx6sll-add-missing-properties-for-sram.patch arm-dts-imx6sx-add-missing-properties-for-sram.patch kselftest-arm64-fix-validatation-termination-record-.patch arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch -arm-orion-fix-include-path.patch btrfs-dump-extra-info-if-one-free-space-cache-has-mo.patch btrfs-scrub-try-to-fix-super-block-errors.patch btrfs-don-t-print-information-about-space-cache-or-t.patch diff --git a/queue-5.19/arm-orion-fix-include-path.patch b/queue-5.19/arm-orion-fix-include-path.patch deleted file mode 100644 index 947e3aa57c4..00000000000 --- a/queue-5.19/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 57077e422c540c2a2a5a8affc069587951c1d16d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 4e3f25de13c1..830b0be038c6 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -2,7 +2,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index 60aaa7fc660..9c0cc857047 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -696,7 +696,6 @@ arm-dts-imx6sx-udoo-neo-don-t-use-multiple-blank-lin.patch kselftest-arm64-fix-validatation-termination-record-.patch arm64-dts-imx8mm-kontron-use-the-vselect-signal-to-s.patch arm64-dts-imx8mq-librem5-add-bq25895-as-max17055-s-p.patch -arm-orion-fix-include-path.patch btrfs-dump-extra-info-if-one-free-space-cache-has-mo.patch btrfs-scrub-properly-report-super-block-errors-in-sy.patch btrfs-scrub-try-to-fix-super-block-errors.patch diff --git a/queue-5.4/arm-orion-fix-include-path.patch b/queue-5.4/arm-orion-fix-include-path.patch deleted file mode 100644 index 87509e50186..00000000000 --- a/queue-5.4/arm-orion-fix-include-path.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 277deb36b412dbd7a1e734c4524c8b4c60e18a3e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 23 Sep 2022 21:55:50 +0200 -Subject: ARM: orion: fix include path - -From: Arnd Bergmann - -[ Upstream commit 63872304bdb3decd5454f4dd210c25395278ed13 ] - -Now that CONFIG_ARCH_MULTIPLATFORM can be disabled anywhere, -there is a build failure for plat-orion: - -arch/arm/plat-orion/irq.c:19:10: fatal error: plat/irq.h: No such file or directory - -Make the include path unconditional. - -Reported-by: kernel test robot -Signed-off-by: Arnd Bergmann -Signed-off-by: Sasha Levin ---- - arch/arm/plat-orion/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile -index 4e3f25de13c1..830b0be038c6 100644 ---- a/arch/arm/plat-orion/Makefile -+++ b/arch/arm/plat-orion/Makefile -@@ -2,7 +2,7 @@ - # - # Makefile for the linux kernel. - # --ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ccflags-y := -I$(srctree)/$(src)/include - - orion-gpio-$(CONFIG_GPIOLIB) += gpio.o - obj-$(CONFIG_PLAT_ORION_LEGACY) += irq.o pcie.o time.o common.o mpp.o --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 1e445ca9882..3e1845cf23f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -228,7 +228,6 @@ arm-dts-imx6qp-add-missing-properties-for-sram.patch arm-dts-imx6sl-add-missing-properties-for-sram.patch arm-dts-imx6sll-add-missing-properties-for-sram.patch arm-dts-imx6sx-add-missing-properties-for-sram.patch -arm-orion-fix-include-path.patch btrfs-scrub-try-to-fix-super-block-errors.patch arm64-dts-uniphier-add-usb-device-support-for-pxs3-r.patch selftests-cpu-hotplug-use-return-instead-of-exit.patch