summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2021-02-02 14:21:31 -0800
committerJakub Kicinski <kuba@kernel.org>2021-02-02 14:21:31 -0800
commitd1e1355aefcc0cbda750a8931e93e1e04a5b0b6a (patch)
treef43b81751cb5c5736268057ecdbcdb99dd00e826 /Makefile
parent9ae4bdc6e4c1281ddf8d6335bea35864d086cbf9 (diff)
parent3aaf0a27ffc29b19a62314edd684b9bc6346f9a8 (diff)
downloadlinux-d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 917f536eb076..54b1ae50c817 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 11
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc6
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*