From 06497fbd52e2f138b7d590c8499d9cebad182850 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 5 Dec 2023 13:16:40 -0500
Subject: Add UPDATING entries and bump version

Approved by:	so
---
 UPDATING            | 23 +++++++++++++++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 996c5744405d..0af118a3f624 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,29 @@ 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.
 
+20231205:
+	14.0-RELEASE-p2	SA-23:17.pf
+			EN-23:17.ossl
+			EN-23:18.openzfs
+			EN-23:19.pkgbase
+			EN-23:20.vm
+			EN-23:21.tty
+			EN-23:22.vfs
+
+	TCP spoofing vulnerability in pf(4) [SA-23:17.pf]
+
+	ossl(4)'s AES-GCM implementation may give incorrect results [EN-23:17.ossl]
+
+	High CPU usage by ZFS kernel threads [EN-23:18.openzfs]
+
+	Incorrect pkgbase version number for FreeBSD 14.0 [EN-23:19.pkgbase]
+
+	Incorrect results from the kernel physical memory allocator [EN-23:20.vm]
+
+	tty(4) IUTF8 causes a kernel panic [EN-23:21.tty]
+
+	ZFS snapshot directories not accessible over NFS [EN-23:22.vfs]
+
 20231130:
 	14.0-RELEASE-p1	EN-23:15.sanitizer
 			EN-23:16.openzfs
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 3ba43dc02fe4..d78502b8c4a5 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
 
 TYPE="FreeBSD"
 REVISION="14.0"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
cgit v1.2.3