From 2aeab55a2f29831470ce7377a53619b25fbc1641 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@fedoraproject.org>
Date: May 02 2022 18:33:42 +0000
Subject: Drop the speed-select build patch, it is upstream


Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

---

diff --git a/0001-Fix-build-flag-passing-for-intel-speed-select.patch b/0001-Fix-build-flag-passing-for-intel-speed-select.patch
deleted file mode 100644
index ce347b7..0000000
--- a/0001-Fix-build-flag-passing-for-intel-speed-select.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a0c122c4fb17f350396cb664d2fc184df9872279 Mon Sep 17 00:00:00 2001
-From: "Herton R. Krzesinski" <herton@redhat.com>
-Date: Mon, 4 Apr 2022 17:43:26 -0300
-Subject: [PATCH] tools/power/x86/intel-speed-select: fix build failure when
- using -Wl,--as-needed
-
-Upstream Status: patch submitted to platform-driver-x86/upstream maintainer
-
-Build of intel-speed-select will fail if you run:
-
-$ LDFLAGS="-Wl,--as-needed" /usr/bin/make V=1
-...
-gcc -O2 -Wall -g -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3 -Wl,--as-needed -lnl-genl-3 -lnl-3 intel-speed-select-in.o -o intel-speed-select
-/usr/bin/ld: intel-speed-select-in.o: in function `handle_event':
-(...)/linux/tools/power/x86/intel-speed-select/hfi-events.c:189: undefined reference to `nlmsg_hdr'
-...
-
-In this case the problem is that order when linking matters when using
-the flag -Wl,--as-needed, symbols not used at that point are discarded.
-So since intel-speed-select-in.o comes after, at that point the
-libraries/symbols are already discarded and then missing/undefined
-references are reported.
-
-To fix this, make sure we specify LDFLAGS after the object file.
-
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- tools/power/x86/intel-speed-select/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/power/x86/intel-speed-select/Makefile b/tools/power/x86/intel-speed-select/Makefile
-index 846f785e278d..7221f2f55e8b 100644
---- a/tools/power/x86/intel-speed-select/Makefile
-+++ b/tools/power/x86/intel-speed-select/Makefile
-@@ -42,7 +42,7 @@ ISST_IN := $(OUTPUT)intel-speed-select-in.o
- $(ISST_IN): prepare FORCE
- 	$(Q)$(MAKE) $(build)=intel-speed-select
- $(OUTPUT)intel-speed-select: $(ISST_IN)
--	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-+	$(QUIET_LINK)$(CC) $(CFLAGS) $< $(LDFLAGS) -o $@
- 
- clean:
- 	rm -f $(ALL_PROGRAMS)
--- 
-GitLab
-
diff --git a/kernel-tools.spec b/kernel-tools.spec
index 6a9112f..e2375ec 100644
--- a/kernel-tools.spec
+++ b/kernel-tools.spec
@@ -109,8 +109,6 @@ Source5000: patch-5.%{upstream_sublevel}-rc%{rcrev}.xz
 %endif
 %endif
 
-Patch1: 0001-Fix-build-flag-passing-for-intel-speed-select.patch
-
 # rpmlint cleanup
 Patch6: 0002-perf-Don-t-make-sourced-script-executable.patch
 
@@ -206,7 +204,6 @@ cd linux-%{kversion}
     xzcat %{SOURCE5000} | patch -p1 -F1 -s
 %endif
 
-%patch1 -p1
 %patch6 -p1
 
 # END OF PATCH APPLICATIONS