From owner-p4-projects@FreeBSD.ORG  Mon Sep  7 22:18:36 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0DE3610656CD; Mon,  7 Sep 2009 22:18:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C659810656C9
	for <perforce@freebsd.org>; Mon,  7 Sep 2009 22:18:35 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B58948FC1D
	for <perforce@freebsd.org>; Mon,  7 Sep 2009 22:18:35 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n87MIZDi032779
	for <perforce@freebsd.org>; Mon, 7 Sep 2009 22:18:35 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n87MIZh4032777
	for perforce@freebsd.org; Mon, 7 Sep 2009 22:18:35 GMT
	(envelope-from trasz@freebsd.org)
Date: Mon, 7 Sep 2009 22:18:35 GMT
Message-Id: <200909072218.n87MIZh4032777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 168312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Sep 2009 22:18:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=168312

Change 168312 by trasz@trasz_anger on 2009/09/07 22:17:51

	Remove spurious diffs.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/Makefile#3 integrate
.. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#33 integrate

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/Makefile#3 (text+ko) ====

@@ -1,7 +1,6 @@
 # $FreeBSD: src/bin/setfacl/Makefile,v 1.8 2004/06/13 19:22:53 obrien Exp $
 
 PROG=	setfacl
-CFLAGS+=-D_ACL_PRIVATE
 SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c
 
 .include <bsd.prog.mk>

==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#33 (text+ko) ====

@@ -3972,6 +3972,7 @@
 		struct thread *a_td;
 	} */ *ap;
 {
+
 	/*
 	 * ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest
 	 * we have to handle by calling vaccess().