svn commit: r342232 - in releng/11.2: . sys/conf

[Ed Maste]

Author: emaste
Date: Wed Dec 19 18:29:46 2018
New Revision: 342232
URL: https://svnweb.freebsd.org/changeset/base/342232

Log:
  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

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

Modified: releng/11.2/UPDATING
==============================================================================
--- releng/11.2/UPDATING	Wed Dec 19 18:22:25 2018	(r342231)
+++ releng/11.2/UPDATING	Wed Dec 19 18:29:46 2018	(r342232)
@@ -16,6 +16,20 @@ 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.
 
+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.

Modified: releng/11.2/sys/conf/newvers.sh
==============================================================================
--- releng/11.2/sys/conf/newvers.sh	Wed Dec 19 18:22:25 2018	(r342231)
+++ releng/11.2/sys/conf/newvers.sh	Wed Dec 19 18:29:46 2018	(r342232)
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi