summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-01-06 07:51:15 +0100
committerIngo Molnar <mingo@kernel.org>2020-01-06 07:51:15 +0100
commit31c7ac388aa905a196ee16dff2015111f701f035 (patch)
tree09a43dde7fbf30ce57eaf5ba7ebda84da961538d /Makefile
parentMerge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts (diff)
parentLinux 5.5-rc5 (diff)
downloadlinux-31c7ac388aa905a196ee16dff2015111f701f035.tar.xz
linux-31c7ac388aa905a196ee16dff2015111f701f035.zip
Merge tag 'v5.5-rc5' into locking/kcsan, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 75f74d71dfa8..046a58e63826 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 5
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc5
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*