The branch releng/12.4 has been updated by gordon:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b1b39c2f2fe4067527d96dfcda70e556a817ff41

commit b1b39c2f2fe4067527d96dfcda70e556a817ff41
Author:     Gordon Tetlow <[email protected]>
AuthorDate: 2023-10-03 21:19:27 +0000
Commit:     Gordon Tetlow <[email protected]>
CommitDate: 2023-10-03 21:19:27 +0000

    Add UPDATING entries and bump version.
    
    Approved by:    so
---
 UPDATING            | 11 +++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index ecde75536cbc..100c281c3786 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,17 @@ 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.
 
+20231003:
+       12.4-RELEASE-p6 FreeBSD-EN-23:09.freebsd-update
+                       FreeBSD-EN-23:12.freebsd-update
+                       FreeBSD-SA-23:12.msdosfs
+
+       freebsd-update incorrectly merges files on upgrade 
[EN-23:09.freebsd-update]
+
+       freebsd-update to 14.0 fails [EN-23:12.freebsd-update]
+
+       Fix msdosfs data disclosure [SA-23:12.msdosfs]
+
 20230906:
        12.4-RELEASE-p5 FreeBSD-SA-23:10.pf
                        FreeBSD-SA-23:11.wifi
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index bb919a38da7d..fa6d3e9340b8 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.4"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
        BRANCH=${BRANCH_OVERRIDE}
 fi

Reply via email to