From owner-p4-projects@FreeBSD.ORG  Fri Jul 25 17:06:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CBD301065679; Fri, 25 Jul 2008 17:06:55 +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 8E62B106566C
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 17:06:55 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from outK.internet-mail-service.net (outk.internet-mail-service.net
	[216.240.47.234])
	by mx1.freebsd.org (Postfix) with ESMTP id 578728FC13
	for <perforce@freebsd.org>; Fri, 25 Jul 2008 17:06:55 +0000 (UTC)
	(envelope-from julian@elischer.org)
Received: from idiom.com (mx0.idiom.com [216.240.32.160])
	by out.internet-mail-service.net (Postfix) with ESMTP id A90A321F8;
	Fri, 25 Jul 2008 10:06:52 -0700 (PDT)
Received: from julian-mac.elischer.org (localhost [127.0.0.1])
	by idiom.com (Postfix) with ESMTP id 6B2612D6031;
	Fri, 25 Jul 2008 10:06:52 -0700 (PDT)
Message-ID: <488A07F8.2040200@elischer.org>
Date: Fri, 25 Jul 2008 10:06:00 -0700
From: Julian Elischer <julian@elischer.org>
User-Agent: Thunderbird 2.0.0.16 (Macintosh/20080707)
MIME-Version: 1.0
To: Marko Zec <zec@FreeBSD.org>
References: <200807251059.m6PAxLfI050222@repoman.freebsd.org>
In-Reply-To: <200807251059.m6PAxLfI050222@repoman.freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 145881 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, 25 Jul 2008 17:06:56 -0000

Marko Zec wrote:
> http://perforce.freebsd.org/chv.cgi?CH=145881
> 
> Change 145881 by zec@zec_tpx32 on 2008/07/25 10:58:22
> 
> 	#ifdef a vimage-specific macro
> 
> Affected files ...
> 
> .. //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#10 edit
> 
> Differences ...
> 
> ==== //depot/projects/vimage-devel/src/sys/netinet/in_pcb.c#10 (text+ko) ====
> 
> @@ -126,7 +126,9 @@
>  	INIT_VNET_INET(curvnet);
>  	int error;
>  
> +#ifdef VIMAGE
>  	SYSCTL_RESOLVE_V_ARG1();
> +#endif
>  
>  	error = sysctl_handle_int(oidp, arg1, arg2, req);
>  	if (error == 0) {


note that you can reverse the order of the arguments I gave you to 
merge changes in the other direction too.
I have already made sure that it will not try merge anything that is 
specific to -devel