diff --git a/UPDATING b/UPDATING index e80c7a696f5..e140bc148cb 100644 --- a/UPDATING +++ b/UPDATING @@ -16,6 +16,16 @@ 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 p18 FreeBSD-SA-18:15.bootpd + FreeBSD-EN-18:17.vm + FreeBSD-EN-18:18.zfs + + bootpd: validate hardware type [SA-18:15.bootpd] + + 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 p17 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 bb0e3d23950..f2caf66dca8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.1" -BRANCH="RELEASE-p17" +BRANCH="RELEASE-p18" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi