From 52d986082942f508af53f46ba60b8000fde1e8b0 Mon Sep 17 00:00:00 2001
From: gordon <gordon@FreeBSD.org>
Date: Wed, 24 Jul 2019 12:58:21 +0000
Subject: [PATCH] Bump version information and update UPDATING.

Approved by:	so
---
 UPDATING            | 22 ++++++++++++++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 9a06291def8..5d53d4f84c9 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,28 @@ 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.
 
+20190724	p12	FreeBSD-EN-19:13.mds
+			FreeBSD-SA-19:12.telnet
+			FreeBSD-SA-19:13.pts
+			FreeBSD-SA-19:14.freebsd32
+			FreeBSD-SA-19:15.mqueuefs
+			FreeBSD-SA-19:16.bhyve
+			FreeBSD-SA-19:17.fd
+
+	Fix panic from Intel CPU vulnerability mitigation. [EN-19:13.mds]
+
+	Fix multiple telnet client vulnerabilities. [SA-19:12.telnet]
+
+	Fix pts write-after-free. [SA-19:13.pts]
+
+	Fix kernel memory disclosure in freebsd32_ioctl. [SA-19:14.freebsd32]
+
+	Fix reference count overflow in mqueuefs. [SA-19:15.mqueuefs]
+
+	Fix byhve out-of-bounds read in XHCI device. [SA-19:16.bhyve]
+
+	Fix file descriptor reference count leak. [SA-19:17.fd]
+
 20190702	p11	FreeBSD-EN-19:12.tzdata
 			FreeBSD-SA-19:09.iconv
 			FreeBSD-SA-19:10.ufs
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0f0d814a0ae..c3556ce82f0 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0