summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-13 12:13:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-13 12:13:05 +0100
commita6184f8e0bb1ba8b444836926cd6967ea176fd31 (patch)
tree34a580e0122747087740436055e834f295b414e4 /Makefile
parent477b8383100023ea0769979cff67e9be3a720397 (diff)
parentb3a987b0264d3ddbb24293ebff10eddfc472f653 (diff)
downloadlinux-next-a6184f8e0bb1ba8b444836926cd6967ea176fd31.tar.gz
linux-next-a6184f8e0bb1ba8b444836926cd6967ea176fd31.zip
Merge 5.5-rc6 into tty-next
We need the serial/tty 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 caf14acf1953..0a7c37dcc5ac 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 5
SUBLEVEL = 0
-EXTRAVERSION = -rc3
+EXTRAVERSION = -rc6
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*