summaryrefslogtreecommitdiffstats
path: root/sys/conf/newvers.sh
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2016-12-07 23:29:42 +0000
committerglebius <glebius@FreeBSD.org>2016-12-07 23:29:42 +0000
commitb416700da72fd8eab0a75d60f0634e254cbb9347 (patch)
tree953fb5ff3b9f37eb695d1b2877f782162f787198 /sys/conf/newvers.sh
parenta78b02757b69caee4861346847156dd77f0c2e21 (diff)
downloadFreeBSD-src-b416700da72fd8eab0a75d60f0634e254cbb9347.zip
FreeBSD-src-b416700da72fd8eab0a75d60f0634e254cbb9347.tar.gz
Merge r309688: address regressions in SA-16:37.libc.
PR: 215105 Submitted by: <jtd2004a sbcglobal.net> Approved by: so
Diffstat (limited to 'sys/conf/newvers.sh')
-rw-r--r--sys/conf/newvers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 78509dd..2e7a09d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="11.0"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p5"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud