From owner-freebsd-current@FreeBSD.ORG  Thu Nov  3 07:44:44 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 61948106566B;
	Thu,  3 Nov 2011 07:44:44 +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 DC4258FC08;
	Thu,  3 Nov 2011 07:44:43 +0000 (UTC)
Received: by vcbfk26 with SMTP id fk26so1334222vcb.13
	for <multiple recipients>; Thu, 03 Nov 2011 00:44:43 -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=GvebTT4Sdk8PLlWSmIuzf1xnk36sWeTEDjwbimMlRMM=;
	b=sR/rgoe2bdLQkgUYz2apOLduAzQZyRmgpALdk8C+5zF135AujIAmXwc5189B07qDtb
	gbTip+u/HqxQ6oETLSo6y2UgTtXnsuoBwZ2rCKAELCSsXw4MfoiMeQllcnUk/MPTZUHs
	sdLeOBPWigxVfJbK3yyN5Sr82nVvm2KPT7kss=
MIME-Version: 1.0
Received: by 10.52.95.164 with SMTP id dl4mr8419102vdb.72.1320306282996; Thu,
	03 Nov 2011 00:44:42 -0700 (PDT)
Sender: adrian.chadd@gmail.com
Received: by 10.52.29.198 with HTTP; Thu, 3 Nov 2011 00:44:42 -0700 (PDT)
In-Reply-To: <4EAF6442.5020901@FreeBSD.org>
References: <CAJ-Vmokj=BJjSrdvM8DxD4PJScakP4N_Kjt_AbF+8=hM_CWX5A@mail.gmail.com>
	<4EAF18B2.9040909@FreeBSD.org>
	<CAJ-Vmon7CiVJs1S9jrWx9+6PjhxVcQyp2kQdkQ49Gcvtzq3-PA@mail.gmail.com>
	<4EAF6442.5020901@FreeBSD.org>
Date: Thu, 3 Nov 2011 00:44:42 -0700
X-Google-Sender-Auth: 3d5HYZycYYpM_bPDuNW8kzDVIYw
Message-ID: <CAJ-VmokSNsM5itmsF8EvT0UvdJLgF21H4iy9HdF-Y9vu82gd3g@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: Thu, 03 Nov 2011 07:44:44 -0000

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

>> 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.
>
> Given that RC1 is already out, you should probably check with re@ first.

I'll poke them tomorrow, but since others have merged in driver
changes and other stuff into -HEAD, I wouldn't be the first person to
merge in bigger things.




Adrian