diff --git a/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch b/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch deleted file mode 100644 index bfbe644..0000000 --- a/patches.rpmify/s390-reintroduce-expoline-dependence-to-scripts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: "Jiri Slaby (SUSE)" -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 -Cc: stable@vger.kernel.org -Cc: Heiko Carstens -Cc: Vasily Gorbik -Cc: Alexander Gordeev -Cc: Christian Borntraeger -Cc: Sven Schnelle -Cc: linux-s390@vger.kernel.org -Signed-off-by: Jiri Slaby ---- - 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/rpm/config.sh b/rpm/config.sh index 587ee28..16356c6 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=6.3-rc4 +SRCVERSION=6.3-rc5 # variant of the kernel-source package, either empty or "-rt" VARIANT= # enable kernel module compression diff --git a/series.conf b/series.conf index 1338ce3..d891427 100644 --- a/series.conf +++ b/series.conf @@ -36,7 +36,6 @@ 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