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@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
