From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
sfr@canb.auug.org.au
Subject: Re: pull request: wireless-next-2.6 2008-11-18
Date: Thu, 20 Nov 2008 09:43:01 -0500 [thread overview]
Message-ID: <20081120144300.GB4329@tuxdriver.com> (raw)
In-Reply-To: <20081120.050348.134053835.davem@davemloft.net>
On Thu, Nov 20, 2008 at 05:03:48AM -0800, David Miller wrote:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Tue, 18 Nov 2008 19:08:52 -0500
>
> > Here is another big round of updates intended for 2.6.29. This batch is
> > mostly driver updates as well as a bunch of file movement. Also, some
> > patches from me are working towards refactoring/minimizing the old
> > ieee80211 component into a support library for ipw2100 and ipw2200 and
> > also collecting more code into lib80211 for sharing between more
> > drivers.
> >
> > Please let me know if there are problems!
> ...
> > P.S. I have included a merge-test branch as an example of how the
> > merge conflicts with the wireless-2.6 pull request from today should
> > be resolved.
>
> John, I took the stable fixes and those are in the pull request
> I just sent to Linus.
>
> Once he takes that in I'll merge those bits into net-next-2.6 and
> resolve the conflicts created solely by that merge.
>
> What I think makes sense right now for your net-next-2.6 stuff is
> for you to just sit tight until I do the merge, then you can respin
> your tree, include Rami Rosen's build fix, and take care of the
> remaining merge issues at the same time.
>
> I'll post on netdev when I do the merging, as I usually do.
Sure, that sounds fine...thanks!
John
--
John W. Linville Linux should be at the core
linville@tuxdriver.com of your literate lifestyle.
prev parent reply other threads:[~2008-11-20 14:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-19 0:08 pull request: wireless-next-2.6 2008-11-18 John W. Linville
2008-11-19 7:36 ` Rami Rosen
2008-11-20 13:03 ` David Miller
2008-11-20 14:43 ` John W. Linville [this message]
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=20081120144300.GB4329@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).