aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2024-06-18 17:48:38 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2024-06-19 20:22:12 +0000
commit0892dff104440867956a53e78c12d66090fec36b (patch)
tree9ab6280ce613840c2d71026770f87bcb7678adc8
parent8e0e6b428cb8ba01941e53256880f7993671e786 (diff)
downloadsrc-0892dff104440867956a53e78c12d66090fec36b.tar.gz
src-0892dff104440867956a53e78c12d66090fec36b.zip
Add UPDATING entries and bump the branch version.
Approved by: so
-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 2d4a66d0d29c..d972b89c5f69 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.
+20240619:
+ 14.1-RELEASE-p1 EN-24:10.zfs
+ EN-24:13.libc++
+
+ Fix kernel memory leak in ZFS [EN-24:10.zfs]
+
+ Fix incorrect size passed to heap allocated std::string delete [EN-24:13.libc++]
+
20240604:
14.1-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 38d445be32a6..8b55836841d7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.1"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi