1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f3bdff8c8d78..471c49fd2f43 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 36
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc6
 NAME = Sheep on Meth
 # *DOCUMENTATION*
@@ -1408,8 +1408,8 @@ checkstack:
        $(OBJDUMP) -d vmlinux $$(find . -name '*.ko') | \
        $(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
-kernelrelease: include/config/kernel.release
+kernelrelease:
-        @echo $(KERNELRELEASE)
+        @echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
 kernelversion:
        @echo $(KERNELVERSION)

diff --git a/Makefile b/Makefile index f3bdff8c8d78..471c49fd2f43 100644 --- a/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@
1	VERSION = 2	1	VERSION = 2
2	PATCHLEVEL = 6	2	PATCHLEVEL = 6
3	SUBLEVEL = 36	3	SUBLEVEL = 36
4	EXTRAVERSION = -rc1	4	EXTRAVERSION = -rc6
5	NAME = Sheep on Meth	5	NAME = Sheep on Meth
6		6
7	# DOCUMENTATION	7	# DOCUMENTATION
@@ -1408,8 +1408,8 @@ checkstack:
1408	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') \| \	1408	$(OBJDUMP) -d vmlinux $$(find . -name '*.ko') \| \
1409	$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)	1409	$(PERL) $(src)/scripts/checkstack.pl $(CHECKSTACK_ARCH)
1410		1410
1411	kernelrelease: include/config/kernel.release	1411	kernelrelease:
1412	@echo $(KERNELRELEASE)	1412	@echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"
1413		1413
1414	kernelversion:	1414	kernelversion:
1415	@echo $(KERNELVERSION)	1415	@echo $(KERNELVERSION)