From owner-p4-projects@FreeBSD.ORG  Fri May 23 07:50:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D4CD41065679; Fri, 23 May 2008 07:50:00 +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 950C3106566C
	for <perforce@freebsd.org>; Fri, 23 May 2008 07:50:00 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8926E8FC27
	for <perforce@freebsd.org>; Fri, 23 May 2008 07:50:00 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4N7o0df049730
	for <perforce@freebsd.org>; Fri, 23 May 2008 07:50:00 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4N7o0II049728
	for perforce@freebsd.org; Fri, 23 May 2008 07:50:00 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 23 May 2008 07:50:00 GMT
Message-Id: <200805230750.m4N7o0II049728@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 142106 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, 23 May 2008 07:50:01 -0000

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

Change 142106 by jb@freebsd3 on 2008/05/23 07:48:59

	IFC

Affected files ...

.. //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#7 integrate
.. //depot/projects/dtrace/src/lib/libelf/libelf_align.c#6 integrate
.. //depot/projects/dtrace/src/lib/libelf/libelf_data.c#10 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#34 integrate

Differences ...

==== //depot/projects/dtrace/src/lib/libelf/elf_strptr.c#7 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.1 2006/11/11 17:16:33 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/elf_strptr.c,v 1.2 2008/05/23 07:35:36 jb Exp $");
 
 #include <sys/param.h>
 

==== //depot/projects/dtrace/src/lib/libelf/libelf_align.c#6 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.2 2006/12/18 05:36:23 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_align.c,v 1.3 2008/05/23 07:33:45 jb Exp $");
 
 #include <sys/types.h>
 

==== //depot/projects/dtrace/src/lib/libelf/libelf_data.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.3 2007/11/23 11:29:36 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/lib/libelf/libelf_data.c,v 1.4 2008/05/23 07:32:19 jb Exp $");
 
 #include <libelf.h>
 #include <osreldate.h>

==== //depot/projects/dtrace/src/sys/kern/kern_linker.c#34 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.157 2008/04/21 17:22:35 pjd Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_linker.c,v 1.158 2008/05/23 07:08:59 jb Exp $");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"