aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2020-06-09 16:15:07 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2020-06-09 16:15:07 +0000
commitbb654a7ebb2416772ab16406d0234dea6ccca74e (patch)
tree45c26b14e17c040be8957f59e4af28d2eff055e4
parent6148d12361aa7dfdec8972eb63b9af30c25fde9a (diff)
downloadsrc-bb654a7ebb2416772ab16406d0234dea6ccca74e.tar.gz
src-bb654a7ebb2416772ab16406d0234dea6ccca74e.zip
Add UPDATING entries and bump version.
Approved by: so Approved by: re (implicit)
Notes
Notes: svn path=/releng/11.4/; revision=361973
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 40190e397887..632eafcfcffa 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ 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.
+20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb
+
+ Fix USB HID descriptor parsing error. [SA-20:17.usb]
+
20200512: 11.4-BETA1-p1 FreeBSD-SA-20:12.libalias
FreeBSD-SA-20:13.libalias
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f45ab92295ed..83f585aae37d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.4"
-BRANCH="RC2"
+BRANCH="RC2-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi