From: Greg Kroah-Hartman Date: Mon, 10 Mar 2025 16:09:34 +0000 (+0100) Subject: drop kbuild patch X-Git-Tag: v5.4.291~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a6204b99321fc8f454380bf252c7a5321b23b6f;p=thirdparty%2Fkernel%2Fstable-queue.git drop kbuild patch --- diff --git a/queue-5.10/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch b/queue-5.10/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch deleted file mode 100644 index 07c0e684fb..0000000000 --- a/queue-5.10/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 17 Feb 2025 08:27:54 +0100 -Subject: kbuild: userprogs: use correct lld when linking through clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Thomas Weißschuh - -commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream. - -The userprog infrastructure links objects files through $(CC). -Either explicitly by manually calling $(CC) on multiple object files or -implicitly by directly compiling a source file to an executable. -The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld -would be used for linking if LLVM=1 is specified. -However clang instead will use either a globally installed cross linker -from $PATH called ${target}-ld or fall back to the system linker, which -probably does not support crosslinking. -For the normal kernel build this is not an issue because the linker is -always executed directly, without the compiler being involved. - -Explicitly pass --ld-path to clang so $(LD) is respected. -As clang 13.0.1 is required to build the kernel, this option is available. - -Fixes: 7f3a59db274c ("kbuild: add infrastructure to build userspace programs") -Cc: stable@vger.kernel.org # needs wrapping in $(cc-option) for < 6.9 -Signed-off-by: Thomas Weißschuh -Reviewed-by: Nathan Chancellor -Signed-off-by: Masahiro Yamada -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -1022,6 +1022,11 @@ endif - KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - -+# userspace programs are linked via the compiler, use the correct linker -+ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) -+KBUILD_USERLDFLAGS += --ld-path=$(LD) -+endif -+ - # make the checker run with the right architecture - CHECKFLAGS += --arch=$(ARCH) - diff --git a/queue-5.10/series b/queue-5.10/series index 355e198e83..6fdfdfa390 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -150,6 +150,7 @@ mmc-sdhci-msm-correctly-set-the-load-for-the-regulat.patch tipc-re-order-conditions-in-tipc_crypto_key_rcv.patch selftests-net-ipsec-fix-null-pointer-dereference-in-.patch input-allocate-keycode-for-phone-linking.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch usb-chipidea-ci_hdrc_imx-use-dev_err_probe.patch usb-chipidea-ci_hdrc_imx-convert-to-platform-remove-.patch usb-chipidea-ci_hdrc_imx-decrement-device-s-refcount.patch @@ -447,7 +448,6 @@ usb-typec-tcpci_rt1711h-unmask-alert-interrupts-to-fix-functionality.patch usb-gadget-set-self-powered-based-on-maxpower-and-bmattributes.patch usb-gadget-fix-setting-self-powered-state-on-suspend.patch usb-gadget-check-bmattributes-only-if-configuration-is-valid.patch -kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch xhci-pci-fix-indentation-in-the-pci-device-id-definitions.patch squashfs-check-the-inode-number-is-not-the-invalid-value-of-zero.patch mei-me-add-panther-lake-p-did.patch diff --git a/queue-5.15/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch b/queue-5.15/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch deleted file mode 100644 index 1d62655da9..0000000000 --- a/queue-5.15/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 17 Feb 2025 08:27:54 +0100 -Subject: kbuild: userprogs: use correct lld when linking through clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Thomas Weißschuh - -commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream. - -The userprog infrastructure links objects files through $(CC). -Either explicitly by manually calling $(CC) on multiple object files or -implicitly by directly compiling a source file to an executable. -The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld -would be used for linking if LLVM=1 is specified. -However clang instead will use either a globally installed cross linker -from $PATH called ${target}-ld or fall back to the system linker, which -probably does not support crosslinking. -For the normal kernel build this is not an issue because the linker is -always executed directly, without the compiler being involved. - -Explicitly pass --ld-path to clang so $(LD) is respected. -As clang 13.0.1 is required to build the kernel, this option is available. - -Fixes: 7f3a59db274c ("kbuild: add infrastructure to build userspace programs") -Cc: stable@vger.kernel.org # needs wrapping in $(cc-option) for < 6.9 -Signed-off-by: Thomas Weißschuh -Reviewed-by: Nathan Chancellor -Signed-off-by: Masahiro Yamada -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -1114,6 +1114,11 @@ endif - KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - -+# userspace programs are linked via the compiler, use the correct linker -+ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) -+KBUILD_USERLDFLAGS += --ld-path=$(LD) -+endif -+ - # make the checker run with the right architecture - CHECKFLAGS += --arch=$(ARCH) - diff --git a/queue-5.15/series b/queue-5.15/series index 5e70cc7ca3..6600ef5ad6 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -222,6 +222,7 @@ tipc-re-order-conditions-in-tipc_crypto_key_rcv.patch selftests-net-ipsec-fix-null-pointer-dereference-in-.patch input-allocate-keycode-for-phone-linking.patch platform-x86-acer-wmi-ignore-ac-events.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch usb-chipidea-ci_hdrc_imx-use-dev_err_probe.patch usb-chipidea-ci_hdrc_imx-convert-to-platform-remove-.patch usb-chipidea-ci_hdrc_imx-decrement-device-s-refcount.patch @@ -595,7 +596,6 @@ usb-typec-tcpci_rt1711h-unmask-alert-interrupts-to-fix-functionality.patch usb-gadget-set-self-powered-based-on-maxpower-and-bmattributes.patch usb-gadget-fix-setting-self-powered-state-on-suspend.patch usb-gadget-check-bmattributes-only-if-configuration-is-valid.patch -kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch xhci-pci-fix-indentation-in-the-pci-device-id-definitions.patch usb-xhci-enable-the-trb-overfetch-quirk-on-via-vl805.patch squashfs-check-the-inode-number-is-not-the-invalid-value-of-zero.patch diff --git a/queue-5.4/apei-ghes-have-ghes-honor-the-panic-setting.patch b/queue-5.4/apei-ghes-have-ghes-honor-the-panic-setting.patch index 8bfbbb53bf..327a94d16d 100644 --- a/queue-5.4/apei-ghes-have-ghes-honor-the-panic-setting.patch +++ b/queue-5.4/apei-ghes-have-ghes-honor-the-panic-setting.patch @@ -31,14 +31,12 @@ Link: https://patch.msgid.link/20250113125224.GFZ4UMiNtWIJvgpveU@fat_crate.local Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- - drivers/acpi/apei/ghes.c | 10 +++++----- + drivers/acpi/apei/ghes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c -index e0d82fab1f448..50bed5a708125 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c -@@ -128,8 +128,6 @@ static unsigned long ghes_estatus_pool_size_request; +@@ -128,8 +128,6 @@ static unsigned long ghes_estatus_pool_s static struct ghes_estatus_cache *ghes_estatus_caches[GHES_ESTATUS_CACHES_SIZE]; static atomic_t ghes_estatus_cache_alloced; @@ -47,7 +45,7 @@ index e0d82fab1f448..50bed5a708125 100644 static void __iomem *ghes_map(u64 pfn, enum fixed_addresses fixmap_idx) { phys_addr_t paddr; -@@ -707,14 +705,16 @@ static void __ghes_panic(struct ghes *ghes, +@@ -707,14 +705,16 @@ static void __ghes_panic(struct ghes *gh struct acpi_hest_generic_status *estatus, u64 buf_paddr, enum fixed_addresses fixmap_idx) { @@ -67,6 +65,3 @@ index e0d82fab1f448..50bed5a708125 100644 } static int ghes_proc(struct ghes *ghes) --- -2.39.5 - diff --git a/queue-5.4/series b/queue-5.4/series index dbefb2e62c..ddd9a82947 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -87,6 +87,7 @@ tomoyo-don-t-emit-warning-in-tomoyo_write_control.patch mfd-lpc_ich-add-another-gemini-lake-isa-bridge-pci-d.patch hid-wacom-add-pci-wacom-device-support.patch apei-ghes-have-ghes-honor-the-panic-setting.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch tasklet-introduce-new-initialization-api.patch net-usb-rtl8150-use-new-tasklet-api.patch net-usb-rtl8150-enable-basic-endpoint-checking.patch diff --git a/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch b/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch deleted file mode 100644 index 36cbe4215d..0000000000 --- a/queue-6.1/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 17 Feb 2025 08:27:54 +0100 -Subject: kbuild: userprogs: use correct lld when linking through clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Thomas Weißschuh - -commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream. - -The userprog infrastructure links objects files through $(CC). -Either explicitly by manually calling $(CC) on multiple object files or -implicitly by directly compiling a source file to an executable. -The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld -would be used for linking if LLVM=1 is specified. -However clang instead will use either a globally installed cross linker -from $PATH called ${target}-ld or fall back to the system linker, which -probably does not support crosslinking. -For the normal kernel build this is not an issue because the linker is -always executed directly, without the compiler being involved. - -Explicitly pass --ld-path to clang so $(LD) is respected. -As clang 13.0.1 is required to build the kernel, this option is available. - -Fixes: 7f3a59db274c ("kbuild: add infrastructure to build userspace programs") -Cc: stable@vger.kernel.org # needs wrapping in $(cc-option) for < 6.9 -Signed-off-by: Thomas Weißschuh -Reviewed-by: Nathan Chancellor -Signed-off-by: Masahiro Yamada -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -1127,6 +1127,11 @@ endif - KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS)) - -+# userspace programs are linked via the compiler, use the correct linker -+ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) -+KBUILD_USERLDFLAGS += --ld-path=$(LD) -+endif -+ - # make the checker run with the right architecture - CHECKFLAGS += --arch=$(ARCH) - diff --git a/queue-6.1/series b/queue-6.1/series index 0fc498e0c6..4de674f841 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -74,7 +74,6 @@ usb-typec-tcpci_rt1711h-unmask-alert-interrupts-to-fix-functionality.patch usb-gadget-set-self-powered-based-on-maxpower-and-bmattributes.patch usb-gadget-fix-setting-self-powered-state-on-suspend.patch usb-gadget-check-bmattributes-only-if-configuration-is-valid.patch -kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch xhci-pci-fix-indentation-in-the-pci-device-id-definitions.patch usb-xhci-enable-the-trb-overfetch-quirk-on-via-vl805.patch kvm-svm-drop-debugctl-from-guest-s-effective-value.patch @@ -95,3 +94,5 @@ revert-kvm-e500-always-restore-irqs.patch revert-kvm-ppc-e500-use-__kvm_faultin_pfn-to-handle-page-faults.patch revert-kvm-ppc-e500-mark-struct-page-pfn-accessed-before-dropping-mmu_lock.patch revert-kvm-ppc-e500-mark-struct-page-dirty-in-kvmppc_e500_shadow_map.patch +uprobes-fix-race-in-uprobe_free_utask.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch diff --git a/queue-6.12/series b/queue-6.12/series index 3777f66c10..2b7ff02908 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -263,3 +263,7 @@ revert-kvm-e500-always-restore-irqs.patch revert-kvm-ppc-e500-use-__kvm_faultin_pfn-to-handle-page-faults.patch revert-kvm-ppc-e500-mark-struct-page-pfn-accessed-before-dropping-mmu_lock.patch revert-kvm-ppc-e500-mark-struct-page-dirty-in-kvmppc_e500_shadow_map.patch +kvm-e500-always-restore-irqs.patch +uprobes-fix-race-in-uprobe_free_utask.patch +selftests-bpf-clean-up-open-coded-gettid-syscall-invocations.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch diff --git a/queue-6.6/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch b/queue-6.6/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch deleted file mode 100644 index d3c7752dba..0000000000 --- a/queue-6.6/kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch +++ /dev/null @@ -1,50 +0,0 @@ -From dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= -Date: Mon, 17 Feb 2025 08:27:54 +0100 -Subject: kbuild: userprogs: use correct lld when linking through clang -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Thomas Weißschuh - -commit dfc1b168a8c4b376fa222b27b97c2c4ad4b786e1 upstream. - -The userprog infrastructure links objects files through $(CC). -Either explicitly by manually calling $(CC) on multiple object files or -implicitly by directly compiling a source file to an executable. -The documentation at Documentation/kbuild/llvm.rst indicates that ld.lld -would be used for linking if LLVM=1 is specified. -However clang instead will use either a globally installed cross linker -from $PATH called ${target}-ld or fall back to the system linker, which -probably does not support crosslinking. -For the normal kernel build this is not an issue because the linker is -always executed directly, without the compiler being involved. - -Explicitly pass --ld-path to clang so $(LD) is respected. -As clang 13.0.1 is required to build the kernel, this option is available. - -Fixes: 7f3a59db274c ("kbuild: add infrastructure to build userspace programs") -Cc: stable@vger.kernel.org # needs wrapping in $(cc-option) for < 6.9 -Signed-off-by: Thomas Weißschuh -Reviewed-by: Nathan Chancellor -Signed-off-by: Masahiro Yamada -Signed-off-by: Greg Kroah-Hartman ---- - Makefile | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/Makefile -+++ b/Makefile -@@ -1057,6 +1057,11 @@ endif - KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)) - KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS)) - -+# userspace programs are linked via the compiler, use the correct linker -+ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_LD_IS_LLD),yy) -+KBUILD_USERLDFLAGS += --ld-path=$(LD) -+endif -+ - # make the checker run with the right architecture - CHECKFLAGS += --arch=$(ARCH) - diff --git a/queue-6.6/series b/queue-6.6/series index f5000d4fbc..49056da4cf 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -105,7 +105,6 @@ usb-typec-tcpci_rt1711h-unmask-alert-interrupts-to-fix-functionality.patch usb-gadget-set-self-powered-based-on-maxpower-and-bmattributes.patch usb-gadget-fix-setting-self-powered-state-on-suspend.patch usb-gadget-check-bmattributes-only-if-configuration-is-valid.patch -kbuild-userprogs-use-correct-lld-when-linking-through-clang.patch xhci-pci-fix-indentation-in-the-pci-device-id-definitions.patch usb-xhci-enable-the-trb-overfetch-quirk-on-via-vl805.patch kvm-svm-drop-debugctl-from-guest-s-effective-value.patch @@ -135,3 +134,6 @@ revert-kvm-e500-always-restore-irqs.patch revert-kvm-ppc-e500-use-__kvm_faultin_pfn-to-handle-page-faults.patch revert-kvm-ppc-e500-mark-struct-page-pfn-accessed-before-dropping-mmu_lock.patch revert-kvm-ppc-e500-mark-struct-page-dirty-in-kvmppc_e500_shadow_map.patch +drm-i915-dsi-use-trans_ddi_func_ctl-s-own-port-width-macro.patch +uprobes-fix-race-in-uprobe_free_utask.patch +x86-mm-don-t-disable-pcid-when-invlpg-has-been-fixed-by-microcode.patch