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

[Glen Barber]

Author: gjb
Date: Thu Jun 29 23:57:35 2017
New Revision: 320487
URL: https://svnweb.freebsd.org/changeset/base/320487

Log:
  - Update stable/11 to 11.1-PRERELEASE for the duration of the
    11.1-RELEASE cycle.
  - Reset __FreeBSD_version for 11.1-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 Jun 29 23:56:50 2017	(r320486)
+++ stable/11/sys/conf/newvers.sh	Thu Jun 29 23:57:35 2017	(r320487)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="BETA3"
+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 Jun 29 23:56:50 2017	(r320486)
+++ stable/11/sys/sys/param.h	Thu Jun 29 23:57:35 2017	(r320487)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100514	/* Master, propagated to newvers */
+#define __FreeBSD_version 1101500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,