aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING3
-rw-r--r--lib/csu/common/crtbrand.c2
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index 88a610e4705c..52e8aaecc102 100644
--- a/UPDATING
+++ b/UPDATING
@@ -17,6 +17,9 @@ 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.
+20211206:
+ 12.3-RELEASE.
+
20210730:
Commit b69019c14cd8 removes pf's DIOCGETSTATESNV ioctl.
As of be70c7a50d32 it is no longer used by userspace, but it does mean
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index f8fb0024db24..0dc3114b2fa7 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -65,7 +65,7 @@ static const struct {
.descsz = sizeof(int32_t),
.type = NT_FREEBSD_ABI_TAG,
.name = NOTE_FREEBSD_VENDOR,
- .desc = __FreeBSD_version
+ .desc = 1203000
};
static const struct {
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e6ab77045930..c927b4b07864 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
TYPE="FreeBSD"
REVISION="12.3"
-BRANCH="RC2"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi