aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING8
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 9 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index c32c3b7ec940..996c5744405d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20231130:
+ 14.0-RELEASE-p1 EN-23:15.sanitizer
+ EN-23:16.openzfs
+
+ Fix clang sanitizer failure with ASLR enabled [EN-23:15.sanitizer]
+
+ OpenZFS data corruption [EN-23:16.openzfs]
+
20231114:
FreeBSD 14.0-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index a2b89f3caca7..3ba43dc02fe4 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.0"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi