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
commit5c94e7106dd70a63736a1fe1d7672f7fe470d642 (patch)
tree50bc73c4e5fc53610b414dc4ac5f14df2ce63940
parentbc689c2fb406fe5ae3ea591f27752a83113838a6 (diff)
downloadsrc-5c94e7106dd70a63736a1fe1d7672f7fe470d642.tar.gz
src-5c94e7106dd70a63736a1fe1d7672f7fe470d642.zip
Add UPDATING entries and bump version.
Approved by: so Approved by: re (implicit)
Notes
Notes: svn path=/releng/12.1/; revision=361973
-rw-r--r--UPDATING10
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 11 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index c4f08eb8508b..28d8d41d83d9 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.
+20200609 p6 FreeBSD-EN-20:11.ena
+ FreeBSD-EN-20:12.iflib
+ FreeBSD-SA-20:17.usb
+
+ Fix stability issues in ena(4) driver. [EN-20:11.ena]
+
+ Fix iflib watchdog timeout resetting idle queues. [EN-20:12.iflib]
+
+ Fix USB HID descriptor parsing error. [SA-20:17.usb]
+
20200512 p5 FreeBSD-EN-20:08.tzdata
FreeBSD-EN-20:09.igb
FreeBSD-EN-20:10.build
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5d8a6a9454c3..e24e5382a52f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.1"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi