aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2018-08-06 20:39:27 +0000
committerXin LI <delphij@FreeBSD.org>2018-08-06 20:39:27 +0000
commit301fa9c0d6ddc3eaec69cf8b71ccbb65b457d3ac (patch)
tree908806da33b0d19618ca12dcd87476fac78d71b7
parentee6b9658b71cbfce89447d6bdbb278987258ec31 (diff)
downloadsrc-301fa9c0d6ddc3eaec69cf8b71ccbb65b457d3ac.tar.gz
src-301fa9c0d6ddc3eaec69cf8b71ccbb65b457d3ac.zip
Bump patch level and document them.
Approved by: so
Notes
Notes: svn path=/releng/11.1/; revision=337395
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index d5088a1e5430..8a23d1462603 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
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
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 326fdd86e5dc..0f509fc76f76 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.1"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi