svn commit: r334459 - in releng/11.2/sys: conf sys

[Glen Barber]

Author: gjb
Date: Fri Jun  1 00:22:49 2018
New Revision: 334459
URL: https://svnweb.freebsd.org/changeset/base/334459

Log:
  Copy stable/11 at r334458 to releng/11.2 as part of the 11.2-RELEASE
  cycle.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: releng/11.2/sys/conf/newvers.sh
==============================================================================
--- stable/11/sys/conf/newvers.sh	Thu May 31 23:55:59 2018	(r334458)
+++ releng/11.2/sys/conf/newvers.sh	Fri Jun  1 00:22:49 2018	(r334459)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="BETA3"
+BRANCH="RC1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/11.2/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Thu May 31 23:55:59 2018	(r334458)
+++ releng/11.2/sys/sys/param.h	Fri Jun  1 00:22:49 2018	(r334459)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1101516	/* Master, propagated to newvers */
+#define __FreeBSD_version 1102000	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,