From owner-p4-projects@FreeBSD.ORG Thu May 22 23:54:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180EB1065670; Thu, 22 May 2008 23:54:22 +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 CDE9A106564A for ; Thu, 22 May 2008 23:54:21 +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 BDF078FC16 for ; Thu, 22 May 2008 23:54:21 +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 m4MNsLEi097979 for ; Thu, 22 May 2008 23:54:21 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4MNsL0H097977 for perforce@freebsd.org; Thu, 22 May 2008 23:54:21 GMT (envelope-from jb@freebsd.org) Date: Thu, 22 May 2008 23:54:21 GMT Message-Id: <200805222354.m4MNsL0H097977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 142075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2008 23:54:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=142075 Change 142075 by jb@freebsd3 on 2008/05/22 23:53:22 Manual update to match current. Affected files ... .. //depot/projects/dtrace/src/sys/dev/random/randomdev_soft.c#7 edit .. //depot/projects/dtrace/src/sys/dev/random/randomdev_soft.h#4 edit .. //depot/projects/dtrace/src/sys/net/ieee8023ad_lacp.c#5 edit .. //depot/projects/dtrace/src/sys/net/if_enc.c#13 edit .. //depot/projects/dtrace/src/sys/net/if_gre.c#13 edit .. //depot/projects/dtrace/src/sys/net/if_gre.h#6 edit .. //depot/projects/dtrace/src/sys/net/if_lagg.c#9 edit Differences ... ==== //depot/projects/dtrace/src/sys/dev/random/randomdev_soft.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/dev/random/randomdev_soft.c,v 1.16 2007/10/20 23:23:18 julian Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/dev/random/randomdev_soft.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/dev/random/randomdev_soft.h,v 1.2 2005/12/20 21:41:52 ps Exp $ */ /* This header contains only those definitions that are global ==== //depot/projects/dtrace/src/sys/net/ieee8023ad_lacp.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net/ieee8023ad_lacp.c,v 1.15 2008/03/16 19:25:30 thompsa Exp $"); #include #include ==== //depot/projects/dtrace/src/sys/net/if_enc.c#13 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/net/if_enc.c,v 1.8 2007/12/26 08:41:58 thompsa Exp $ + * $FreeBSD: src/sys/net/if_enc.c,v 1.9 2008/03/24 22:16:46 jkim Exp $ */ #include ==== //depot/projects/dtrace/src/sys/net/if_gre.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_gre.c,v 1.49 2003/12/11 00:22:29 itojun Exp $ */ -/* $FreeBSD: src/sys/net/if_gre.c,v 1.46 2007/06/26 23:01:01 rwatson Exp $ */ +/* $FreeBSD: src/sys/net/if_gre.c,v 1.48 2008/05/09 23:02:56 julian Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/dtrace/src/sys/net/if_gre.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: if_gre.h,v 1.13 2003/11/10 08:51:52 wiz Exp $ */ -/* $FreeBSD: src/sys/net/if_gre.h,v 1.13 2005/06/10 16:49:18 brooks Exp $ */ +/* $FreeBSD: src/sys/net/if_gre.h,v 1.14 2008/05/09 23:02:56 julian Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. ==== //depot/projects/dtrace/src/sys/net/if_lagg.c#9 (text+ko) ==== @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net/if_lagg.c,v 1.27 2008/03/16 19:25:30 thompsa Exp $"); #include "opt_inet.h" #include "opt_inet6.h"