diff --git a/UPDATING b/UPDATING index 003bc1514b3..58dae591ea3 100644 --- a/UPDATING +++ b/UPDATING @@ -16,6 +16,13 @@ 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. +20191112 p1 FreeBSD-EN-19:19.loader + FreeBSD-SA-19:25.mcepsc + + Fix UEFI Loader Memory Fragmentation [EN-19:19.loader] + + Fix Machine Check Exception on Page Size Change [SA-19:25.mcepsc] + 20191104: 12.1-RELEASE. diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d94f4161d1f..2ab3101e467 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.1" -BRANCH="RELEASE" +BRANCH="RELEASE-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi