diff --git a/UPDATING b/UPDATING index d5088a1e543..8a23d146260 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 326fdd86e5d..0f509fc76f7 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