svn commit: r303976 - in stable/11/sys: conf sys

[Glen Barber]

Author: gjb
Date: Thu Aug 11 23:43:46 2016
New Revision: 303976
URL: https://svnweb.freebsd.org/changeset/base/303976

Log:
  Update stable/11 to 11.0-PRERELEASE.
  Reset __FreeBSD_version for 11.0-STABLE.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/sys/conf/newvers.sh
  stable/11/sys/sys/param.h

Modified: stable/11/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu Aug 11 23:39:23 2016	(r303975)
+++ stable/11/sys/conf/newvers.sh	Thu Aug 11 23:43:46 2016	(r303976)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.0"
-BRANCH="BETA4"
+BRANCH="PRERELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: stable/11/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Thu Aug 11 23:39:23 2016	(r303975)
+++ stable/11/sys/sys/param.h	Thu Aug 11 23:43:46 2016	(r303976)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100120	/* Master, propagated to newvers */
+#define __FreeBSD_version 1101000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,