From owner-svn-src-all@FreeBSD.ORG  Mon Jun 18 21:00:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0B4061065672;
	Mon, 18 Jun 2012 21:00:55 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EA4CD8FC12;
	Mon, 18 Jun 2012 21:00:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5IL0sOZ000622;
	Mon, 18 Jun 2012 21:00:54 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5IL0suU000619;
	Mon, 18 Jun 2012 21:00:54 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <201206182100.q5IL0suU000619@svn.freebsd.org>
From: "Simon L. Nielsen" <simon@FreeBSD.org>
Date: Mon, 18 Jun 2012 21:00:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r237242 - in releng/8.1: . sys/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jun 2012 21:00:55 -0000

Author: simon
Date: Mon Jun 18 21:00:54 2012
New Revision: 237242
URL: http://svn.freebsd.org/changeset/base/237242

Log:
  Add UPDATING and newvers.sh information for the FreeBSD-SA-12:04.sysret
  correction.
  
  Approved by:	so (simon)

Modified:
  releng/8.1/UPDATING
  releng/8.1/sys/conf/newvers.sh

Modified: releng/8.1/UPDATING
==============================================================================
--- releng/8.1/UPDATING	Mon Jun 18 20:48:21 2012	(r237241)
+++ releng/8.1/UPDATING	Mon Jun 18 21:00:54 2012	(r237242)
@@ -15,6 +15,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	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

Modified: releng/8.1/sys/conf/newvers.sh
==============================================================================
--- releng/8.1/sys/conf/newvers.sh	Mon Jun 18 20:48:21 2012	(r237241)
+++ releng/8.1/sys/conf/newvers.sh	Mon Jun 18 21:00:54 2012	(r237242)
@@ -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