summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2025-12-16 16:28:47 +0000
committerMark Johnston <markj@FreeBSD.org>2025-12-16 23:42:39 +0000
commit63a5b645b23e1e1b6c5023a02703109282ef2a27 (patch)
tree1d08946eaf3474d4facb3e58324a44caa0cf14d7
parent408f5c61821f5b29f59b5a72bafa07d406db9834 (diff)
Add UPDATING entries and bump version.release/15.0.0-p1releng/15.0
Approved by: so
-rw-r--r--UPDATING11
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 12 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index c23c9a66cbaa..b529467ca9cb 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,17 @@ 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.
+20251216:
+ 15.0-RELEASE-p1 SA-25:12.rtsold
+ EN-25:19.zfs
+ EN-25:20.vmm
+
+ Remote code execution via ND6 Router Advertisements. [SA-25:12.rtsold]
+
+ Unprivileged kernel NULL pointer dereference. [EN-25:19.zfs]
+
+ bhyve(8) PCI passthru regression. [EN-25:20.vmm]
+
20251202:
15.0-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e48cfd747602..c86157eaf8e5 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -51,7 +51,7 @@
TYPE="FreeBSD"
REVISION="15.0"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi