From owner-freebsd-current@FreeBSD.ORG  Sun May  7 22:29:22 2006
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
X-Original-To: current@freebsd.org
Delivered-To: freebsd-current@FreeBSD.ORG
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 945D316A402
	for <current@freebsd.org>; Sun,  7 May 2006 22:29:22 +0000 (UTC)
	(envelope-from sam@errno.com)
Received: from ebb.errno.com (ebb.errno.com [69.12.149.25])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A7A543D46
	for <current@freebsd.org>; Sun,  7 May 2006 22:29:22 +0000 (GMT)
	(envelope-from sam@errno.com)
Received: from [10.0.0.248] (trouble.errno.com [10.0.0.248])
	(authenticated bits=0)
	by ebb.errno.com (8.13.6/8.12.6) with ESMTP id k47MTKqm007637
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Sun, 7 May 2006 15:29:21 -0700 (PDT) (envelope-from sam@errno.com)
Message-ID: <445E74C0.9010209@errno.com>
Date: Sun, 07 May 2006 15:29:20 -0700
From: Sam Leffler <sam@errno.com>
User-Agent: Thunderbird 1.5 (X11/20060210)
MIME-Version: 1.0
To: Jiri Mikulas <konfer@mikulas.com>
References: <445D3C94.10102@errno.com> <445E4A86.8000207@mikulas.com>
In-Reply-To: <445E4A86.8000207@mikulas.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: current@freebsd.org
Subject: Re: CFT: new ath hal (take 2)
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 May 2006 22:29:22 -0000

Jiri Mikulas wrote:
> Hello
> FYI
> 
> todays RELENG_6
> with
> __FBSDID("$FreeBSD: /repoman/r/ncvs/src/sys/dev/ath/if_ath.c,v 1.143 2006/05/06 23:23:39 sam Exp $");
> 
> 
> x -mno-3dnow -mno-sse -mno-sse2 -ffreestanding -Werror  /usr/src/sys/dev/ath/if_ath.c
> /usr/src/sys/dev/ath/if_ath.c: In function `ath_attach':
> /usr/src/sys/dev/ath/if_ath.c:396: error: too few arguments to function `taskqueue_create'
> /usr/src/sys/dev/ath/if_ath.c:397: warning: implicit declaration of function `taskqueue_start_threads'
> /usr/src/sys/dev/ath/if_ath.c:397: warning: nested extern declaration of `taskqueue_start_threads'
> /usr/src/sys/dev/ath/if_ath.c: In function `ath_fatal_proc':
> /usr/src/sys/dev/ath/if_ath.c:822: warning: implicit declaration of function `ath_hal_getfatalstate'
> /usr/src/sys/dev/ath/if_ath.c:822: warning: nested extern declaration of `ath_hal_getfatalstate'
> *** Error code 1
> 
> Stop in /usr/obj/usr/src/sys/ROUTER-IPFW-PF.
> *** Error code 1
> 
> Stop in /usr/src.
> *** Error code 1
> 
> Stop in /usr/src.
> 
> 
> did I something wrong, please ?

You need just the change in rev 1.143, not the entire file.  To 
backmerge a single delta I typically do something like

cvs up -j1.142 -j1.143 if_ath.c

(then hand-patch any conflicts that matter--typically the rcs id gets 
botched).

	Sam