svn commit: r340471 - in stable/12/sys: conf sys

[Glen Barber]

Author: gjb
Date: Fri Nov 16 00:03:31 2018
New Revision: 340471
URL: https://svnweb.freebsd.org/changeset/base/340471

Log:
  - Update stable/12 from BETA4 to PRERELEASE as releng/12.0 had
    been branched.
  - Bump __FreeBSD_version.
  
  Approved by:	re (implicit)
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/12/sys/conf/newvers.sh
==============================================================================
--- stable/12/sys/conf/newvers.sh	Fri Nov 16 00:00:59 2018	(r340470)
+++ stable/12/sys/conf/newvers.sh	Fri Nov 16 00:03:31 2018	(r340471)
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.0"
-BRANCH="BETA4"
+BRANCH="PRERELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Fri Nov 16 00:00:59 2018	(r340470)
+++ stable/12/sys/sys/param.h	Fri Nov 16 00:03:31 2018	(r340471)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1200086	/* Master, propagated to newvers */
+#define __FreeBSD_version 1200500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,