From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 07:40:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 47CFE1065679; Sat,  8 Nov 2008 07:40:10 +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 0CE651065672
	for <perforce@freebsd.org>; Sat,  8 Nov 2008 07:40:10 +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 F1DB88FC0A
	for <perforce@freebsd.org>; Sat,  8 Nov 2008 07:40:09 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mA87e92F029762
	for <perforce@freebsd.org>; Sat, 8 Nov 2008 07:40:09 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mA87e9t1029760
	for perforce@freebsd.org; Sat, 8 Nov 2008 07:40:09 GMT
	(envelope-from trasz@freebsd.org)
Date: Sat, 8 Nov 2008 07:40:09 GMT
Message-Id: <200811080740.mA87e9t1029760@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 152646 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: Sat, 08 Nov 2008 07:40:10 -0000

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

Change 152646 by trasz@trasz_traszkan on 2008/11/08 07:39:58

	Fix mismerge.  These flags were removed from CURRENT.

Affected files ...

.. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#14 edit

Differences ...

==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#14 (text+ko) ====

@@ -314,9 +314,6 @@
 #define	VEXEC			000000000100	/* execute/search permission */
 #define	VWRITE			000000000200	/* write permission */
 #define	VREAD			000000000400	/* read permission */
-#define	VSVTX			000000001000	/* sticky bit */
-#define	VSGID			000000002000	/* set group id on execution */
-#define	VSUID			000000004000	/* set user id on execution */
 #define	VADMIN			000000010000	/* being the file owner */
 #define	VSTAT			000000020000	/* permission to retrieve attrs */
 #define	VAPPEND			000000040000	/* permission to write/append */