X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=Makefile;h=f836936fb4d8b919f0b1692bff41b4df61dfd0ec;hb=f026be0e1e881e3395c3d5418ffc8c2a2203c3f3;hp=f5543eef4f8227a40d6a0b5a2646ff8f38658d89;hpb=825a0714d2b3883d4f8ff64f6933fb73ee3f1834;p=linux-block.git

diff --git a/Makefile b/Makefile
index f5543eef4f82..f836936fb4d8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
-PATCHLEVEL = 3
+PATCHLEVEL = 4
 SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION = -rc2
 NAME = Hurr durr I'ma ninja sloth
 
 # *DOCUMENTATION*
@@ -1113,7 +1113,8 @@ LDFLAGS_vmlinux	+= -X
 endif
 
 ifeq ($(CONFIG_RELR),y)
-LDFLAGS_vmlinux	+= --pack-dyn-relocs=relr --use-android-relr-tags
+# ld.lld before 15 did not support -z pack-relative-relocs.
+LDFLAGS_vmlinux	+= $(call ld-option,--pack-dyn-relocs=relr,-z pack-relative-relocs)
 endif
 
 # We never want expected sections to be placed heuristically by the