From owner-p4-projects@FreeBSD.ORG  Wed May  5 18:41:53 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9EE8416A4D0; Wed,  5 May 2004 18:41:53 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 7457416A4CE
	for <perforce@freebsd.org>; Wed,  5 May 2004 18:41:53 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5FD1843D39
	for <perforce@freebsd.org>; Wed,  5 May 2004 18:41:53 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i461frGe009690
	for <perforce@freebsd.org>; Wed, 5 May 2004 18:41:53 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i461fqnX009681
	for perforce@freebsd.org; Wed, 5 May 2004 18:41:52 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 May 2004 18:41:52 -0700 (PDT)
Message-Id: <200405060141.i461fqnX009681@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 52331 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 06 May 2004 01:41:54 -0000

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

Change 52331 by rwatson@rwatson_paprika on 2004/05/05 18:41:19

	Remove dup items in the MERGE list.

Affected files ...

.. //depot/projects/trustedbsd/mac/MERGE#10 edit

Differences ...

==== //depot/projects/trustedbsd/mac/MERGE#10 (text+ko) ====

@@ -36,8 +36,6 @@
 
 	fsck_ffs ea support
 
-	direct exec of rc
-
 	acl.9 expansions
 
 	ls(1) labels without long form
@@ -61,8 +59,6 @@
 
 	Build a MAC kernel by default, include in installs/releases.
 
-	setfsmac(8) reference in sbin rather than usr/sbin.
-
 	SAVESTART flag in kern_exec.c -- is this needed?
 
 	missingops?