summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-01-26 07:51:48 +0100
committerTakashi Iwai <tiwai@suse.de>2021-01-26 07:51:48 +0100
commit4f2da3324eaff382ab1c6aaef8c10180b2f4d08c (patch)
tree38dab378ba4ad014d83151f020cc1e5979be0d6d /Makefile
parentALSA: hda/tegra: Remove unnecessary null-check from hda_tegra_runtime_resume() (diff)
parentisa: Make the remove callback for isa drivers return void (diff)
downloadlinux-4f2da3324eaff382ab1c6aaef8c10180b2f4d08c.tar.xz
linux-4f2da3324eaff382ab1c6aaef8c10180b2f4d08c.zip
Merge tag 'tags/isa-void-remove-callback' into for-next
isa: Make the remove callback for isa drivers return void Link: https://lore.kernel.org/r/20210122092449.426097-1-uwe@kleine-koenig.org Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 3d328b7ab200..b0e4767735dc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 11
SUBLEVEL = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc4
NAME = Kleptomaniac Octopus
# *DOCUMENTATION*