From owner-p4-projects  Tue Nov  5 10:12:35 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 205DA37B401; Tue,  5 Nov 2002 10:12:32 -0800 (PST)
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 5F28937B418
	for <perforce@freebsd.org>; Tue,  5 Nov 2002 10:12:31 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 15EB543E6E
	for <perforce@freebsd.org>; Tue,  5 Nov 2002 10:12:31 -0800 (PST)
	(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.6/8.12.6) with ESMTP id gA5IAimV046880
	for <perforce@freebsd.org>; Tue, 5 Nov 2002 10:10:44 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gA5IAiGs046877
	for perforce@freebsd.org; Tue, 5 Nov 2002 10:10:44 -0800 (PST)
Date: Tue, 5 Nov 2002 10:10:44 -0800 (PST)
Message-Id: <200211051810.gA5IAiGs046877@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>
Subject: PERFORCE change 20707 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 20707 by rwatson@rwatson_tislabs on 2002/11/05 10:10:34

	Integ the execve mis-merge fix: a no-op for us because I fixed it in
	the integ.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#47 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_exec.c#47 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/kern/kern_exec.c,v 1.196 2002/11/05 17:51:55 rwatson Exp $
+ * $FreeBSD: src/sys/kern/kern_exec.c,v 1.197 2002/11/05 18:04:50 rwatson Exp $
  */
 
 #include "opt_ktrace.h"

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message