summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-09-28 15:44:52 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-09-28 15:44:52 -0300
commit717d182e4173c037fb9e720a046dec804fd9990e (patch)
tree51f14a932abcbbb17c3eb023c63179e2843982d7 /Makefile
parenta55b7bb1c14662490689e094964ecc5387bb2b55 (diff)
parentfb0155a09b0224a7147cb07a4ce6034c8d29667f (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get v5.10 development in sync with the main kernel sources. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 19d012810fbb..992d24467ca0 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 9
SUBLEVEL = 0
-EXTRAVERSION = -rc5
+EXTRAVERSION = -rc7
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*