From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 6 Jun 2024 12:55:45 +0000 (+0200)
Subject: drop 6.1 patch that didn't apply
X-Git-Tag: v6.1.93~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13c4c73e68d3efb8012e49b94e0d2dce06d05ed3;p=thirdparty%2Fkernel%2Fstable-queue.git

drop 6.1 patch that didn't apply
---

diff --git a/queue-6.1/s390-vdso-create-.build-id-links-for-unstripped-vdso.patch b/queue-6.1/s390-vdso-create-.build-id-links-for-unstripped-vdso.patch
deleted file mode 100644
index 344591b41db..00000000000
--- a/queue-6.1/s390-vdso-create-.build-id-links-for-unstripped-vdso.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e5fcc928a0c3c2fe5e6e2c66a16b7d67334fac02 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 29 Apr 2024 17:02:53 +0200
-Subject: s390/vdso: Create .build-id links for unstripped vdso files
-
-From: Jens Remus <jremus@linux.ibm.com>
-
-[ Upstream commit fc2f5f10f9bc5e58d38e9fda7dae107ac04a799f ]
-
-Citing Andy Lutomirski from commit dda1e95cee38 ("x86/vdso: Create
-.build-id links for unstripped vdso files"):
-
-"With this change, doing 'make vdso_install' and telling gdb:
-
-set debug-file-directory /lib/modules/KVER/vdso
-
-will enable vdso debugging with symbols.  This is useful for
-testing, but kernel RPM builds will probably want to manually delete
-these symlinks or otherwise do something sensible when they strip
-the vdso/*.so files."
-
-Fixes: 4bff8cb54502 ("s390: convert to GENERIC_VDSO")
-Signed-off-by: Jens Remus <jremus@linux.ibm.com>
-Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/Makefile.vdsoinst | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/Makefile.vdsoinst b/scripts/Makefile.vdsoinst
-index c477d17b0aa5b..a81ca735003e4 100644
---- a/scripts/Makefile.vdsoinst
-+++ b/scripts/Makefile.vdsoinst
-@@ -21,7 +21,7 @@ $$(dest): $$(src) FORCE
- 	$$(call cmd,install)
- 
- # Some architectures create .build-id symlinks
--ifneq ($(filter arm sparc x86, $(SRCARCH)),)
-+ifneq ($(filter arm s390 sparc x86, $(SRCARCH)),)
- link := $(install-dir)/.build-id/$$(shell $(READELF) -n $$(src) | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p').debug
- 
- __default: $$(link)
--- 
-2.43.0
-
diff --git a/queue-6.1/series b/queue-6.1/series
index 0967af74bf7..5cf339dada0 100644
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -347,7 +347,6 @@ loongarch-fix-callchain-parse-error-with-kernel-trac.patch
 s390-vdso-filter-out-mno-pic-data-is-text-relative-c.patch
 s390-vdso64-filter-out-munaligned-symbols-flag-for-v.patch
 s390-vdso-generate-unwind-information-for-c-modules.patch
-s390-vdso-create-.build-id-links-for-unstripped-vdso.patch
 s390-vdso-use-standard-stack-frame-layout.patch
 s390-ipl-fix-incorrect-initialization-of-len-fields-.patch
 s390-ipl-fix-incorrect-initialization-of-nvme-dump-b.patch