From 822b09abf81fda27d3bd5ebc0a4f56b353806597 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 5 Apr 2021 09:41:37 +0200 Subject: [PATCH] drop kbuild-add-resolve_btfids-clean-to-root-clean-target.patch from 5.10 and 5.11 trees It broke 'make clean' --- ...ve_btfids-clean-to-root-clean-target.patch | 52 ------------------- queue-5.10/series | 1 - ...ve_btfids-clean-to-root-clean-target.patch | 52 ------------------- queue-5.11/series | 1 - 4 files changed, 106 deletions(-) delete mode 100644 queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch delete mode 100644 queue-5.11/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch diff --git a/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch b/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch deleted file mode 100644 index f4bb3f26f96..00000000000 --- a/queue-5.10/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9acf956f7d0fd02e5f83ad1d1b997e3902932a1d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Feb 2021 13:40:20 +0100 -Subject: kbuild: Add resolve_btfids clean to root clean target - -From: Jiri Olsa - -[ Upstream commit 50d3a3f81689586697a38cd60070181ebe626ad9 ] - -The resolve_btfids tool is used during the kernel build, -so we should clean it on kernel's make clean. - -Invoking the the resolve_btfids clean as part of root -'make clean'. - -Signed-off-by: Jiri Olsa -Signed-off-by: Andrii Nakryiko -Acked-by: Song Liu -Link: https://lore.kernel.org/bpf/20210205124020.683286-5-jolsa@kernel.org -Signed-off-by: Sasha Levin ---- - Makefile | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 4801cc25e347..98d64592496a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1083,6 +1083,11 @@ ifdef CONFIG_STACK_VALIDATION - endif - endif - -+PHONY += resolve_btfids_clean -+ -+resolve_btfids_clean: -+ $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean -+ - ifdef CONFIG_BPF - ifdef CONFIG_DEBUG_INFO_BTF - ifeq ($(has_libelf),1) -@@ -1500,7 +1505,7 @@ vmlinuxclean: - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean - $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean) - --clean: archclean vmlinuxclean -+clean: archclean vmlinuxclean resolve_btfids_clean - - # mrproper - Delete all generated files, including .config - # --- -2.30.2 - diff --git a/queue-5.10/series b/queue-5.10/series index 974415213be..262163154fa 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -96,7 +96,6 @@ kvm-x86-mmu-factor-out-functions-to-add-remove-tdp-m.patch kvm-x86-mmu-use-atomic-ops-to-set-sptes-in-tdp-mmu-m.patch kvm-x86-compile-out-tdp-mmu-on-32-bit-systems.patch kvm-x86-mmu-ensure-tlbs-are-flushed-for-tdp-mmu-duri.patch -kbuild-add-resolve_btfids-clean-to-root-clean-target.patch extcon-add-stubs-for-extcon_register_notifier_all-fu.patch extcon-fix-error-handling-in-extcon_dev_register.patch firmware-stratix10-svc-reset-command_reconfig_flag_p.patch diff --git a/queue-5.11/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch b/queue-5.11/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch deleted file mode 100644 index 16018bd7277..00000000000 --- a/queue-5.11/kbuild-add-resolve_btfids-clean-to-root-clean-target.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fd66d4c0ab5d8598794c4cf9be364f60f4a37436 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Feb 2021 13:40:20 +0100 -Subject: kbuild: Add resolve_btfids clean to root clean target - -From: Jiri Olsa - -[ Upstream commit 50d3a3f81689586697a38cd60070181ebe626ad9 ] - -The resolve_btfids tool is used during the kernel build, -so we should clean it on kernel's make clean. - -Invoking the the resolve_btfids clean as part of root -'make clean'. - -Signed-off-by: Jiri Olsa -Signed-off-by: Andrii Nakryiko -Acked-by: Song Liu -Link: https://lore.kernel.org/bpf/20210205124020.683286-5-jolsa@kernel.org -Signed-off-by: Sasha Levin ---- - Makefile | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7578e0d9622f..26ce47df83f6 100644 ---- a/Makefile -+++ b/Makefile -@@ -1082,6 +1082,11 @@ ifdef CONFIG_STACK_VALIDATION - endif - endif - -+PHONY += resolve_btfids_clean -+ -+resolve_btfids_clean: -+ $(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(abspath $(objtree))/tools/bpf/resolve_btfids clean -+ - ifdef CONFIG_BPF - ifdef CONFIG_DEBUG_INFO_BTF - ifeq ($(has_libelf),1) -@@ -1499,7 +1504,7 @@ vmlinuxclean: - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/link-vmlinux.sh clean - $(Q)$(if $(ARCH_POSTLINK), $(MAKE) -f $(ARCH_POSTLINK) clean) - --clean: archclean vmlinuxclean -+clean: archclean vmlinuxclean resolve_btfids_clean - - # mrproper - Delete all generated files, including .config - # --- -2.30.2 - diff --git a/queue-5.11/series b/queue-5.11/series index 651354b3169..97f43e73021 100644 --- a/queue-5.11/series +++ b/queue-5.11/series @@ -118,7 +118,6 @@ kvm-x86-mmu-factor-out-functions-to-add-remove-tdp-m.patch kvm-x86-mmu-use-atomic-ops-to-set-sptes-in-tdp-mmu-m.patch kvm-x86-compile-out-tdp-mmu-on-32-bit-systems.patch kvm-x86-mmu-ensure-tlbs-are-flushed-for-tdp-mmu-duri.patch -kbuild-add-resolve_btfids-clean-to-root-clean-target.patch extcon-add-stubs-for-extcon_register_notifier_all-fu.patch extcon-fix-error-handling-in-extcon_dev_register.patch firmware-stratix10-svc-reset-command_reconfig_flag_p.patch -- 2.47.3