From owner-p4-projects@FreeBSD.ORG  Fri May 19 04:31:34 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D077416A425; Fri, 19 May 2006 04:31:34 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 AD15D16A422
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:31:34 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7A59443D49
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:31:34 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4J4V75t052621
	for <perforce@freebsd.org>; Fri, 19 May 2006 04:31:07 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4J4V6ft052618
	for perforce@freebsd.org; Fri, 19 May 2006 04:31:06 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 19 May 2006 04:31:06 GMT
Message-Id: <200605190431.k4J4V6ft052618@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 97443 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: Fri, 19 May 2006 04:31:35 -0000

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

Change 97443 by jb@jb_freebsd2 on 2006/05/19 04:30:17

	A merge I missed.

Affected files ...

.. //depot/projects/dtrace/src/sys/conf/files.i386#6 edit

Differences ...

==== //depot/projects/dtrace/src/sys/conf/files.i386#6 (text+ko) ====

@@ -83,14 +83,8 @@
 	no-implicit-rule
 #
 #
->>>> ORIGINAL files.i386#190
-==== THEIRS files.i386#193
-compat/linprocfs/linprocfs.c	optional linprocfs
-compat/linsysfs/linsysfs.c	optional linsysfs
-==== YOURS files.i386
 cddl/i386/cyclic_machdep.c	optional cyclic \
 	compile-with "${NORMAL_C} -D_SOLARIS_C_SOURCE -I$S/contrib/opensolaris/compat"
-<<<<
 compat/linux/linux_file.c	optional compat_linux
 compat/linux/linux_getcwd.c	optional compat_linux
 compat/linux/linux_ioctl.c	optional compat_linux