From owner-svn-src-head@FreeBSD.ORG Sun Apr 29 16:14:09 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C974E106566B; Sun, 29 Apr 2012 16:14:09 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B4B938FC0C; Sun, 29 Apr 2012 16:14:09 +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 q3TGE9RX021401; Sun, 29 Apr 2012 16:14:09 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3TGE9Ws021398; Sun, 29 Apr 2012 16:14:09 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201204291614.q3TGE9Ws021398@svn.freebsd.org> From: Marius Strobl Date: Sun, 29 Apr 2012 16:14:09 +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: r234792 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2012 16:14:09 -0000 Author: marius Date: Sun Apr 29 16:14:09 2012 New Revision: 234792 URL: http://svn.freebsd.org/changeset/base/234792 Log: Drag in subr_acl_nfs4.c for ZFS automatically, otherwise it's unintuitive that "options zfs" requires "options ufs_acl". Modified: head/sys/conf/files Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Sun Apr 29 16:12:31 2012 (r234791) +++ head/sys/conf/files Sun Apr 29 16:14:09 2012 (r234792) @@ -2553,7 +2553,7 @@ kern/sched_ule.c optional sched_ule kern/serdev_if.m standard kern/stack_protector.c standard \ compile-with "${NORMAL_C:N-fstack-protector*}" -kern/subr_acl_nfs4.c optional ufs_acl +kern/subr_acl_nfs4.c optional ufs_acl | zfs kern/subr_acl_posix1e.c optional ufs_acl kern/subr_autoconf.c standard kern/subr_blist.c standard