summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2020-01-20 10:42:47 +0300
committerIngo Molnar <mingo@kernel.org>2020-01-20 10:42:47 +0300
commit837171fe77d700222bb75ef5fe26f4785fcd9e99 (patch)
tree3d73dc7328db9636f0ac0e11961ec031647ed39d /Makefile
parentc29a59e43829beabc4c26036ebcc6a32dd0b6a01 (diff)
parentdef9d2780727cec3313ed3522d0123158d87224d (diff)
downloadlinux-837171fe77d700222bb75ef5fe26f4785fcd9e99.tar.xz
Merge tag 'v5.5-rc7' into locking/kcsan, to refresh the tree
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 046a58e63826..745acf90bc02 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 5
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*