summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-25 08:55:12 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-05-25 08:55:12 +0200
commitf7d8f3f092d001f8d91552d2697643e727694942 (patch)
tree0dfa61cc5b94eef94dfbaf1efdc362385792d0f2 /Makefile
parent2cd38fd15e4ebcfe917a443734820269f8b5ba2b (diff)
parent9cb1fd0efd195590b828b9b865421ad345a4a145 (diff)
Merge 5.7-rc7 into driver-core-next
We need the driver core fixes in here as well Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 11fe9b1535de..f0d118b86287 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 7
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*