From a0e8ac475c5b1c9a1afa8c87afdb54327f60e288 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Mar 16 2023 11:33:19 +0000
Subject: s390: reintroduce expoline dependence to scripts (s390 expolines

& fixdep).

---

diff --git a/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch b/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch
new file mode 100644
index 0000000..bfbe644
--- /dev/null
+++ b/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch
@@ -0,0 +1,47 @@
+From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
+Date: Thu, 16 Mar 2023 12:05:08 +0100
+Subject: s390: reintroduce expoline dependence to scripts
+Patch-mainline: submitted <20230316112809.7903-1-jirislaby@kernel.org>
+References: s390 expolines & fixdep
+
+Expolines depend on scripts/basic/fixdep. And build of expolines can now
+race with the fixdep build:
+
+ make[1]: *** Deleting file 'arch/s390/lib/expoline/expoline.o'
+ /bin/sh: line 1: scripts/basic/fixdep: Permission denied
+ make[1]: *** [../scripts/Makefile.build:385: arch/s390/lib/expoline/expoline.o] Error 126
+ make: *** [../arch/s390/Makefile:166: expoline_prepare] Error 2
+
+The dependence was removed in the below Fixes: commit. So reintroduce
+the dependence on scripts.
+
+Fixes: a0b0987a7811 ("s390/nospec: remove unneeded header includes")
+Cc: Joe Lawrence <joe.lawrence@redhat.com>
+Cc: stable@vger.kernel.org
+Cc: Heiko Carstens <hca@linux.ibm.com>
+Cc: Vasily Gorbik <gor@linux.ibm.com>
+Cc: Alexander Gordeev <agordeev@linux.ibm.com>
+Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
+Cc: Sven Schnelle <svens@linux.ibm.com>
+Cc: linux-s390@vger.kernel.org
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ arch/s390/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/s390/Makefile b/arch/s390/Makefile
+index b3235ab0ace8..ed646c583e4f 100644
+--- a/arch/s390/Makefile
++++ b/arch/s390/Makefile
+@@ -162,7 +162,7 @@ vdso_prepare: prepare0
+ 
+ ifdef CONFIG_EXPOLINE_EXTERN
+ modules_prepare: expoline_prepare
+-expoline_prepare:
++expoline_prepare: scripts
+ 	$(Q)$(MAKE) $(build)=arch/s390/lib/expoline arch/s390/lib/expoline/expoline.o
+ endif
+ endif
+-- 
+2.40.0
+
diff --git a/series.conf b/series.conf
index 7123c82..64d2371 100644
--- a/series.conf
+++ b/series.conf
@@ -36,6 +36,7 @@
 	patches.rpmify/Add-ksym-provides-tool.patch
 	patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
 	patches.rpmify/BTF-Don-t-break-ABI-when-debuginfo-is-disabled.patch
+	patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch
 
 	########################################################
 	# The sorted section should contain all patches that are