svn commit: r320486 - in releng/11.1/sys: conf sys

[Glen Barber]

Author: gjb
Date: Thu Jun 29 23:56:50 2017
New Revision: 320486
URL: https://svnweb.freebsd.org/changeset/base/320486

Log:
  - Copy stable/11 at r320475 to releng/11.1 as part of the 11.1-RELEASE
    cycle.
  - Prune svn:mergeinfo from the new branch.
  - Bump __FreeBSD_version.
  - Rename releng/11.1 to RC1.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

Added:
     - copied from r320475, stable/11/
Directory Properties:
  releng/11.1/   (props changed)
Modified:
  releng/11.1/sys/conf/newvers.sh
  releng/11.1/sys/sys/param.h

Modified: releng/11.1/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu Jun 29 17:34:48 2017	(r320475)
+++ releng/11.1/sys/conf/newvers.sh	Thu Jun 29 23:56:50 2017	(r320486)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="BETA3"
+BRANCH="RC1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/11.1/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Thu Jun 29 17:34:48 2017	(r320475)
+++ releng/11.1/sys/sys/param.h	Thu Jun 29 23:56:50 2017	(r320486)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100514	/* Master, propagated to newvers */
+#define __FreeBSD_version 1101000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,