Re: request: merging if_ath_tx branch to HEAD

2011-11-03 Thread Adrian Chadd
On 31 October 2011 20:15, Doug Barton do...@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

Re: request: merging if_ath_tx branch to HEAD

2011-11-03 Thread Arnaud Lacombe
Hi, On Thu, Nov 3, 2011 at 3:44 AM, Adrian Chadd adr...@freebsd.org wrote: On 31 October 2011 20:15, Doug Barton do...@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,

Re: request: merging if_ath_tx branch to HEAD

2011-11-03 Thread Adrian Chadd
On 3 November 2011 09:45, Arnaud Lacombe lacom...@gmail.com wrote: Maybe not the place to ask, but why are you (ie. FreeBSD folks) unable to unleash commit to `trunk' and let only required MFC go to `stable/9' ? Hi, We can. It's just that we're being nice to keep the diffs between -HEAD and

Re: request: merging if_ath_tx branch to HEAD

2011-10-31 Thread Doug Barton
On 10/31/2011 14:17, Adrian Chadd wrote: Hi all, I'd like to merge the if_ath_tx code into -HEAD so it gets some wider testing. This includes a couple of net80211 changes but it overwhelmingly is if_ath driver changes. The code is a bit messy and it's still a work in progress but I'd

Re: request: merging if_ath_tx branch to HEAD

2011-10-31 Thread Aleksandr Rybalko
On Mon, 31 Oct 2011 14:17:28 -0700 Adrian Chadd adr...@freebsd.org wrote: Hi all, I'd like to merge the if_ath_tx code into -HEAD so it gets some wider testing. This includes a couple of net80211 changes but it overwhelmingly is if_ath driver changes. The code is a bit messy and it's

Re: request: merging if_ath_tx branch to HEAD

2011-10-31 Thread Adrian Chadd
On 31 October 2011 14:52, Doug Barton do...@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

Re: request: merging if_ath_tx branch to HEAD

2011-10-31 Thread Doug Barton
On 10/31/2011 17:22, Adrian Chadd wrote: On 31 October 2011 14:52, Doug Barton do...@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