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

[Glen Barber]

Author: gjb
Date: Fri May  8 00:04:25 2020
New Revision: 360805
URL: https://svnweb.freebsd.org/changeset/base/360805

Log:
  - Update stable/11 from PRERELEASE to STABLE after releng/11.4
    had branched.
  - Bump __FreeBSD_version.
  
  Approved by:	re (implicit)
  Sponsored by:	Rubicon Communications, LLC (netgate.com)

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	Fri May  8 00:02:59 2020	(r360804)
+++ stable/11/sys/conf/newvers.sh	Fri May  8 00:04:25 2020	(r360805)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.4"
-BRANCH="PRERELEASE"
+BRANCH="STABLE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: stable/11/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Fri May  8 00:02:59 2020	(r360804)
+++ stable/11/sys/sys/param.h	Fri May  8 00:04:25 2020	(r360805)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1103511	/* Master, propagated to newvers */
+#define __FreeBSD_version 1104500	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,