From: "John W. Linville" <linville@tuxdriver.com>
To: David Miller <davem@davemloft.net>
Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: pull request: wireless-next-2.6 2010-07-23
Date: Fri, 23 Jul 2010 17:39:31 -0400 [thread overview]
Message-ID: <20100723213931.GF2426@tuxdriver.com> (raw)
In-Reply-To: <20100723.140320.116366019.davem@davemloft.net>
On Fri, Jul 23, 2010 at 02:03:20PM -0700, David Miller wrote:
> From: "John W. Linville" <linville@tuxdriver.com>
> Date: Fri, 23 Jul 2010 16:40:29 -0400
>
> > Yet another batch intended for 2.6.36... Mostly the usual random lot
> > of stuff, mostly driver updates. This batch also includes a flurry
> > of Sparse-inspired patches from me -- it is hard to resist once the
> > "bug" bites! As usual, all of these have been cooking in linux-next
> > for at least several days.
> >
> > Please let me know if there are problems!
>
> Auto-merging drivers/net/wireless/iwlwifi/iwl-commands.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-commands.h
>
> I don't even have to look at the file to know that it's
> another one of those __packed things.
>
> I'll fix it up again, but I know you can sense how tiring
> this has become for me.
I'm sorry, Dave! I should have done a for-davem branch. FWIW,
I intended to do a test merge but it must have slipped my fragile
mind. :-(
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:[~2010-07-23 21:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 20:40 pull request: wireless-next-2.6 2010-07-23 John W. Linville
2010-07-23 21:03 ` David Miller
2010-07-23 21:39 ` 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=20100723213931.GF2426@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=davem@davemloft.net \
--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).