From owner-freebsd-current@FreeBSD.ORG  Tue Nov  1 00:22:35 2011
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33EA9106566B;
	Tue,  1 Nov 2011 00:22:35 +0000 (UTC)
	(envelope-from adrian.chadd@gmail.com)
Received: from mail-vx0-f182.google.com (mail-vx0-f182.google.com
	[209.85.220.182])
	by mx1.freebsd.org (Postfix) with ESMTP id B5BBD8FC17;
	Tue,  1 Nov 2011 00:22:34 +0000 (UTC)
Received: by vcbfk26 with SMTP id fk26so2188270vcb.13
	for <multiple recipients>; Mon, 31 Oct 2011 17:22:33 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=mime-version:sender:in-reply-to:references:date
	:x-google-sender-auth:message-id:subject:from:to:cc:content-type;
	bh=EcB+zylS/SCTK7eXqRWw/oGbTUtRTQlsB64MV3cpRbI=;
	b=wJUzzvp8gcIJoCPnXB3WK/gL/fNyWGbH69bWcKH2g3AZyRCUW9GrqxlDAHLvg/8ZpZ
	Y3wIUxgxWkeuf3Ray0ee7lpigjjp0bpX1PhNOhlrHyNlcOR+vhe7V9MmDe6XeLMtGBtK
	7n6jAVceJ88O3u+QqJ74mKTzx5H54bl9FYYMs=
MIME-Version: 1.0
Received: by 10.52.100.70 with SMTP id ew6mr6081659vdb.49.1320106953729; Mon,
	31 Oct 2011 17:22:33 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.52.164.101 with HTTP; Mon, 31 Oct 2011 17:22:33 -0700 (PDT)
In-Reply-To: <4EAF18B2.9040909@FreeBSD.org>
References: <CAJ-Vmokj=BJjSrdvM8DxD4PJScakP4N_Kjt_AbF+8=hM_CWX5A@mail.gmail.com>
	<4EAF18B2.9040909@FreeBSD.org>
Date: Mon, 31 Oct 2011 17:22:33 -0700
X-Google-Sender-Auth: qzERnkLlPvwX5f7qAjmA_Ol_YM8
Message-ID: <CAJ-Vmon7CiVJs1S9jrWx9+6PjhxVcQyp2kQdkQ49Gcvtzq3-PA@mail.gmail.com>
From: Adrian Chadd <adrian@freebsd.org>
To: Doug Barton <dougb@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
Cc: freebsd-wireless@freebsd.org, freebsd-current <freebsd-current@freebsd.org>
Subject: Re: request: merging if_ath_tx branch to HEAD
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: Tue, 01 Nov 2011 00:22:35 -0000

On 31 October 2011 14:52, Doug Barton <dougb@freebsd.org> wrote:

>> The code is a bit messy and it's still a work in progress but I'd
>> rather tidy it up in -HEAD. Otherwise I'm stuck in the unfortunate
>> situation of having to keep merging between the if_ath_tx branch and
>> -HEAD.
>
> Is this work that is planned to be migrated to 9.0-RELEASE? If not,
> shouldn't it wait till after the release?

Well, it depends on how long 9.0-RELEASE is going to take. If it's
going to take days, then sure I can wait. But if it's going to take
weeks, I'll likely _have_ the rest of the if_ath_tx missing pieces
done and ready for merge into 9.0.

In any case, I do want to merge the ath 11n stuff into -9, so even if
it's not done by 9.0, it'll be done shortly after.



Adrian