svn commit: r337395 - in releng: 10.4 10.4/sys/conf 11.1 11.1/sys/conf 11.2 11.2/sys/conf

[Xin LI]

Author: delphij
Date: Mon Aug  6 20:39:27 2018
New Revision: 337395
URL: https://svnweb.freebsd.org/changeset/base/337395

Log:
  Bump patch level and document them.
  
  Approved by:	so

Modified:
  releng/10.4/UPDATING
  releng/10.4/sys/conf/newvers.sh
  releng/11.1/UPDATING
  releng/11.1/sys/conf/newvers.sh
  releng/11.2/UPDATING
  releng/11.2/sys/conf/newvers.sh

Modified: releng/10.4/UPDATING
==============================================================================
--- releng/10.4/UPDATING	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/10.4/UPDATING	Mon Aug  6 20:39:27 2018	(r337395)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20180806	p10	FreeBSD-SA-18:08.tcp
+
+	Fix resource exhaustion in TCP reassembly.
+
 20180508	p9	FreeBSD-SA-18:06.debugreg
 			FreeBSD-EN-18:05.mem
 			FreeBSD-EN-18:06.tzdata

Modified: releng/10.4/sys/conf/newvers.sh
==============================================================================
--- releng/10.4/sys/conf/newvers.sh	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/10.4/sys/conf/newvers.sh	Mon Aug  6 20:39:27 2018	(r337395)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.4"
-BRANCH="RELEASE-p9"
+BRANCH="RELEASE-p10"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/11.1/UPDATING
==============================================================================
--- releng/11.1/UPDATING	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/11.1/UPDATING	Mon Aug  6 20:39:27 2018	(r337395)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20180806	p12	FreeBSD-SA-18:08.tcp
+
+	Fix resource exhaustion in TCP reassembly.
+
 20180621	p11	FreeBSD-SA-18:07.lazyfpu
 			FreeBSD-EN-18:07.pmap
 

Modified: releng/11.1/sys/conf/newvers.sh
==============================================================================
--- releng/11.1/sys/conf/newvers.sh	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/11.1/sys/conf/newvers.sh	Mon Aug  6 20:39:27 2018	(r337395)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.1"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi

Modified: releng/11.2/UPDATING
==============================================================================
--- releng/11.2/UPDATING	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/11.2/UPDATING	Mon Aug  6 20:39:27 2018	(r337395)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20180806	p1	FreeBSD-SA-18:08.tcp
+
+	Fix resource exhaustion in TCP reassembly.
+
 20180627:
 	11.2-RELEASE.
 

Modified: releng/11.2/sys/conf/newvers.sh
==============================================================================
--- releng/11.2/sys/conf/newvers.sh	Mon Aug  6 19:21:32 2018	(r337394)
+++ releng/11.2/sys/conf/newvers.sh	Mon Aug  6 20:39:27 2018	(r337395)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi