summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-06-22 10:19:14 +0200
committerIngo Molnar <mingo@kernel.org>2017-06-22 10:19:14 +0200
commitf9e169883164390a15b56d00cb7e22c2e72f4dba (patch)
tree2a946cfff76d6dd41005d0dd534e0bd97641019d /Makefile
parentcde50a67397c0da7d11795d4b4418384022ab8e6 (diff)
parent8d829b9bb878904f3419af8003176a12910b94e8 (diff)
Merge branch 'linus' into locking/core, to pick up fixes
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 853ae9179af9..e40c471abe29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
VERSION = 4
PATCHLEVEL = 12
SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION = -rc6
NAME = Fearless Coyote
# *DOCUMENTATION*