summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2017-08-10 06:59:07 +0000
committerdelphij <delphij@FreeBSD.org>2017-08-10 06:59:07 +0000
commit91baad1bb58bfa59793d9421521a9faf7df0edca (patch)
tree42938bf2e6e785a0b129322177b5ff0a1ddeeba9 /sys/conf
parent2f4b735c66deb54490042a818e8fd26fa46818f1 (diff)
downloadFreeBSD-src-releng/11.1.zip
FreeBSD-src-releng/11.1.tar.gz
Fix OpenSSH Denial of Service vulnerability. [SA-17:06]releng/11.1
Fix VNET kernel panic with asynchronous I/O. [EN-17:07] Fix pf(4) housekeeping thread causes kernel panic. [EN-17:08] Approved by: so
Diffstat (limited to 'sys/conf')
-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 ec9e129..5ba2ab2 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.1"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
OpenPOWER on IntegriCloud