From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Re: pull request: wireless-2.6 2008-09-11 Date: Thu, 11 Sep 2008 16:35:53 -0400 Message-ID: <20080911203552.GL3423@tuxdriver.com> References: <20080911201308.GJ3423@tuxdriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, sfr@canb.auug.org.au To: davem@davemloft.net Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:43785 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752987AbYIKUlg (ORCPT ); Thu, 11 Sep 2008 16:41:36 -0400 Content-Disposition: inline In-Reply-To: <20080911201308.GJ3423@tuxdriver.com> Sender: netdev-owner@vger.kernel.org List-ID: On Thu, Sep 11, 2008 at 04:13:08PM -0400, John W. Linville wrote: > Dave, > > Here is one fix for 2.6.27. It is a backport of a patch that is already > in net-next-2.6. Since it is for a new driver (ath9k) and since it > fixes a reported bug (http://bugzilla.kernel.org/show_bug.cgi?id=11394) > I think it should be OK to pass it to Linus for the current cycle. > > John BTW, this (obviously) introduces a merge conflict between wireless-2.6 and wireless-next-2.6. The solution is trivial -- just take the wireless-next-2.6 version of the affected files. Still, I have a sample merge available here: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git merge-test Hth! John -- John W. Linville linville@tuxdriver.com