As the automatically generated git version information is misleading in the merge window, name the kernel in the merge window as 3.8-merge .
This 'merge' version information helps to not interfere with 3.7-stable git versions in the bootloader (grub) selection until 3.8-rc1 is tagged. Signed-off-by: Oliver Hartkopp <[email protected]> --- diff --git a/Makefile b/Makefile index 540f7b2..1fd4bf4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ VERSION = 3 -PATCHLEVEL = 7 +PATCHLEVEL = 8 SUBLEVEL = 0 -EXTRAVERSION = +EXTRAVERSION = -merge NAME = Terrified Chipmunk # *DOCUMENTATION* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

