From owner-p4-projects@FreeBSD.ORG  Tue Aug 11 21:04:35 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3967F1065670; Tue, 11 Aug 2009 21:04:35 +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 EBD40106564A
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 21:04:34 +0000 (UTC)
	(envelope-from anchie@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DAE138FC21
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 21:04:34 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n7BL4Yb2086617
	for <perforce@FreeBSD.org>; Tue, 11 Aug 2009 21:04:34 GMT
	(envelope-from anchie@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n7BL4Y6I086615
	for perforce@freebsd.org; Tue, 11 Aug 2009 21:04:34 GMT
	(envelope-from anchie@FreeBSD.org)
Date: Tue, 11 Aug 2009 21:04:34 GMT
Message-Id: <200908112104.n7BL4Y6I086615@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	anchie@FreeBSD.org using -f
From: Ana Kukec <anchie@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 167223 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: Tue, 11 Aug 2009 21:04:36 -0000

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

Change 167223 by anchie@anchie_desnimis on 2009/08/11 21:04:20

	Removing collisions after integrate.	

Affected files ...

.. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#10 edit

Differences ...

==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#10 (text+ko) ====

@@ -1,10 +1,4 @@
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/icmp6.h#20
 /*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.24 2009/04/29 10:20:17 bms Exp $	*/
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/icmp6.h#23
-/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.27 2009/08/02 19:43:32 rwatson Exp $	*/
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet/icmp6.h
-/*	$FreeBSD: src/sys/netinet/icmp6.h,v 1.21.8.1 2009/04/15 03:14:26 kensmith Exp $	*/
-<<<<
 /*	$KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $	*/
 
 /*-
@@ -609,10 +603,6 @@
 };
 
 #ifdef _KERNEL
->>>> ORIGINAL //depot/vendor/freebsd/src/sys/netinet/icmp6.h#20
-#define	ICMP6STAT_ADD(name, val)	V_icmp6stat.name += (val)
-#define	ICMP6STAT_INC(name)		ICMP6STAT_ADD(name, 1)
-==== THEIRS //depot/vendor/freebsd/src/sys/netinet/icmp6.h#23
 /*
  * In-kernel consumers can use these accessor macros directly to update
  * stats.
@@ -626,10 +616,6 @@
 void	kmod_icmp6stat_inc(int statnum);
 #define	KMOD_ICMP6STAT_INC(name)					\
 	kmod_icmp6stat_inc(offsetof(struct icmp6stat, name) / sizeof(u_quad_t))
-==== YOURS //anchie_desnimis/gsoc2009-send/src/sys/netinet/icmp6.h
-#define		ICMP6STAT_ADD(name, val)	V_icmp6stat.name += (val)
-#define		ICMP6STAT_INC(name)		ICMP6STAT_ADD(name, 1)
-<<<<
 #endif