From: "John W. Linville" <linville@tuxdriver.com>
To: davem@davemloft.net
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org, sfr@canb.auug.org.au
Subject: Re: pull request: wireless-2.6 2008-09-11
Date: Thu, 11 Sep 2008 16:35:53 -0400 [thread overview]
Message-ID: <20080911203552.GL3423@tuxdriver.com> (raw)
In-Reply-To: <20080911201308.GJ3423@tuxdriver.com>
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
next prev parent reply other threads:[~2008-09-11 20:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-11 20:13 pull request: wireless-2.6 2008-09-11 John W. Linville
2008-09-11 20:35 ` John W. Linville [this message]
2008-09-11 23:09 ` David Miller
2008-09-11 23:09 ` David Miller
2008-09-11 22:37 ` David Miller
2008-09-11 22:37 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080911203552.GL3423@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.