From owner-svn-src-all@FreeBSD.ORG  Sat Feb  4 20:17:07 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C734F106566B;
	Sat,  4 Feb 2012 20:17:07 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B1BE38FC08;
	Sat,  4 Feb 2012 20:17:07 +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 q14KH7Kf050344;
	Sat, 4 Feb 2012 20:17:07 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q14KH72v050342;
	Sat, 4 Feb 2012 20:17:07 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201202042017.q14KH72v050342@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sat, 4 Feb 2012 20:17:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230996 - head/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: Sat, 04 Feb 2012 20:17:07 -0000

Author: pjd
Date: Sat Feb  4 20:17:07 2012
New Revision: 230996
URL: http://svn.freebsd.org/changeset/base/230996

Log:
  After multiple requests for back out, after multiple promisses from adrian@
  to fix it (without fixing it), after making one of my servers unbootable,
  after now making also my laptop unbootable and after running out of patiance
  back out r229800 until better solution is found.

Modified:
  head/sys/conf/files

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files	Sat Feb  4 20:09:06 2012	(r230995)
+++ head/sys/conf/files	Sat Feb  4 20:17:07 2012	(r230996)
@@ -2405,9 +2405,8 @@ kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
 kern/stack_protector.c		standard \
 	compile-with "${NORMAL_C:N-fstack-protector*}"
-# XXX subr_acl_nfs4.c is also used by ZFS
-kern/subr_acl_nfs4.c		optional ufs_acl
-kern/subr_acl_posix1e.c		optional ufs_acl
+kern/subr_acl_nfs4.c		standard
+kern/subr_acl_posix1e.c		standard
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
 kern/subr_bus.c			standard