From: "John W. Linville" <linville@tuxdriver.com>
To: "Allan, Bruce W" <bruce.w.allan@intel.com>
Cc: David Miller <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel.com>,
"amit@netxen.com" <amit@netxen.com>
Subject: Re: MERGE check, net-next-2.6...
Date: Mon, 30 Nov 2009 16:20:35 -0500 [thread overview]
Message-ID: <20091130212035.GF21401@tuxdriver.com> (raw)
In-Reply-To: <8DD2590731AB5D4C9DBF71A877482A903E332F65@orsmsx509.amr.corp.intel.com>
On Mon, Nov 30, 2009 at 12:54:48PM -0800, Allan, Bruce W wrote:
> >-----Original Message-----
> >From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org]
> >On Behalf Of David Miller
> >Sent: Sunday, November 29, 2009 1:17 AM
> >To: netdev@vger.kernel.org
> >Cc: Kirsher, Jeffrey T; linville@tuxdriver.com; amit@netxen.com
> >Subject: MERGE check, net-next-2.6...
> >
> >
> >I just merged net-2.6 into net-next-2.6, there were several
> >conflicts.
> >
> >They happened in e1000e, ath9k, generic ieee80211, and the
> >netxen driver.
> >
> >Please check my work and send any necessary fixes.
> >
> >Thanks!
>
> Your merge conflict fix-ups for e1000e look good to me. Thanks!
The wireless bits seem alright too...
--
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-30 21:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-29 9:17 MERGE check, net-next-2.6 David Miller
2009-11-30 20:54 ` Allan, Bruce W
2009-11-30 21:02 ` David Miller
2009-11-30 21:20 ` 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=20091130212035.GF21401@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=amit@netxen.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=jeffrey.t.kirsher@intel.com \
--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 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.