From 3c79c6d9ab5a2bc982d1c9bef6f1e074999f9c20 Mon Sep 17 00:00:00 2001
From: emaste <emaste@FreeBSD.org>
Date: Wed, 19 Dec 2018 18:29:46 +0000
Subject: [PATCH] 11.2-RELEASE-p7 UPDATING

Approved by:	so
Security:	FreeBSD-SA-18:15.bootpd
Security:	FreeBSD-EN-18:16.ptrace
Security:	FreeBSD-EN-18:17.vm
Security:	FreeBSD-EN-18:18.zfs
---
 UPDATING            | 14 ++++++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index ff522efafde..d4c0a4bb36c 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,20 @@ 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.
 
+20181219	p7	FreeBSD-SA-18:15.bootpd
+			FreeBSD-EN-18:16.ptrace
+			FreeBSD-EN-18:17.vm
+			FreeBSD-EN-18:18.zfs
+
+	bootpd: validate hardware type [SA-18:15.bootpd]
+
+	Only clear a pending thread event if one is pending. [EN-18:16.ptrace]
+
+	Update the free page count when blacklisting pages. [EN-18:17.vm]
+
+	Resolve a hang in ZFS during vnode reclamation [EN-18:18.zfs]
+
+
 20181204	p6	FreeBSD-SA-18:14.bhyve
 
 	Fix insufficient bounds checking in bhyve(8) device model.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8aa6c26ddc0..cef6908e121 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0