From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: pull request: wireless-2.6 2009-11-11
Date: Wed, 11 Nov 2009 15:51:42 -0500 [thread overview]
Message-ID: <20091111205141.GK4392@tuxdriver.com> (raw)
In-Reply-To: <20091111.114114.228545645.davem@davemloft.net>
On Wed, Nov 11, 2009 at 11:41:14AM -0800, David Miller wrote:
> From: David Miller <davem@davemloft.net>
> Date: Wed, 11 Nov 2009 11:20:31 -0800 (PST)
>
> > From: "John W. Linville" <linville@tuxdriver.com>
> > Date: Wed, 11 Nov 2009 12:22:55 -0500
> >
> >> P.S. Due to the aformentioned iwlwifi fix, this will cause -next
> >> conflicts for sfr. You may want to pull net-2.6 into net-next-2.6 after
> >> pulling this. The iwlwifi conflicts can be resolved by taking the bigger
> >> hunks...
> >
> > Yep, I noticed this, I'll sort it out, thanks.
>
> I just pushed out the merge to net-next-2.6, please double
> check my work.
Found a little merge damage, sent a fixup patch to netdev@vger.kernel.org...
Thanks! Sorry if I gave bad merge conflict fixup advice...
John
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
prev parent reply other threads:[~2009-11-11 20:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-11 17:22 pull request: wireless-2.6 2009-11-11 John W. Linville
2009-11-11 19:20 ` David Miller
[not found] ` <20091111.112031.184370997.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2009-11-11 19:41 ` David Miller
2009-11-11 20:51 ` 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=20091111205141.GK4392@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 \
/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).