Re-apply r362079, renaming releng/11.4 to -RELEASE, in preparationupstream/11.4.0release/11.4.0

for restarting 11.4-RELEASE builds.

Approved by:	re (implicit)
Sponsored by:	Rubicon Communications, LLC (netgate.com)

3 files changed, 5 insertions, 2 deletions

diff --git a/UPDATING b/UPDATING
index 632eafcfcffa..3ab424ed339e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,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.
 
+20200616:
+	11.4-RELEASE.
+
 20200609: 11.4-RC2-p1	FreeBSD-SA-20:17.usb
 
         Fix USB HID descriptor parsing error. [SA-20:17.usb]
diff --git a/lib/csu/common/crtbrand.c b/lib/csu/common/crtbrand.c
index a379dfa61085..94d97bc70c06 100644
--- a/lib/csu/common/crtbrand.c
+++ b/lib/csu/common/crtbrand.c
@@ -63,5 +63,5 @@ static const struct {
 	.descsz = sizeof(int32_t),
 	.type = NT_FREEBSD_ABI_TAG,
 	.name = NOTE_FREEBSD_VENDOR,
-	.desc = __FreeBSD_version
+	.desc = 1104001
 };
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 83f585aae37d..ce94973f73fd 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.4"
-BRANCH="RC2-p1"
+BRANCH="RELEASE"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi