aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2012-06-18 21:00:54 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2012-06-18 21:00:54 +0000
commit5c8a7533b1866d2a801a68a1b622008614dc3544 (patch)
tree71d0fe8c26f189e30189fdf4df40cc53ad2fef53
parent7a395ce1678e7d16ed5027e23d660cbdde83e505 (diff)
downloadsrc-5c8a7533b1866d2a801a68a1b622008614dc3544.tar.gz
src-5c8a7533b1866d2a801a68a1b622008614dc3544.zip
Add UPDATING and newvers.sh information for the FreeBSD-SA-12:04.sysret
correction. Approved by: so (simon)
Notes
Notes: svn path=/releng/8.1/; revision=237242
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index d4b1f2851348..b40e9bcc47e5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW ON IA64 OR SUN4V:
debugging tools present in HEAD were left in place because
sun4v support still needs work to become production ready.
+
+20120618: p12 FreeBSD-SA-12:04.sysret
+ Correct patch for FreeBSD-SA-12:04.sysret.
+
20120612: p11 FreeBSD-SA-12:03.bind
FreeBSD-SA-12:04.sysret
FreeBSD-EN-12:02.ipv6refcount
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 6d189c93ed57..50bd18b7f795 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="8.1"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi