* MERGE check, net-next-2.6...
@ 2009-11-29 9:17 David Miller
2009-11-30 20:54 ` Allan, Bruce W
0 siblings, 1 reply; 4+ messages in thread
From: David Miller @ 2009-11-29 9:17 UTC (permalink / raw)
To: netdev; +Cc: jeffrey.t.kirsher, linville, amit
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!
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: MERGE check, net-next-2.6...
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
0 siblings, 2 replies; 4+ messages in thread
From: Allan, Bruce W @ 2009-11-30 20:54 UTC (permalink / raw)
To: David Miller, netdev@vger.kernel.org
Cc: Kirsher, Jeffrey T, linville@tuxdriver.com, amit@netxen.com
>-----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!
Bruce.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: MERGE check, net-next-2.6...
2009-11-30 20:54 ` Allan, Bruce W
@ 2009-11-30 21:02 ` David Miller
2009-11-30 21:20 ` John W. Linville
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2009-11-30 21:02 UTC (permalink / raw)
To: bruce.w.allan; +Cc: netdev, jeffrey.t.kirsher, linville, amit
From: "Allan, Bruce W" <bruce.w.allan@intel.com>
Date: Mon, 30 Nov 2009 12:54:48 -0800
> Your merge conflict fix-ups for e1000e look good to me. Thanks!
Thanks a lot for checking Allan.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: MERGE check, net-next-2.6...
2009-11-30 20:54 ` Allan, Bruce W
2009-11-30 21:02 ` David Miller
@ 2009-11-30 21:20 ` John W. Linville
1 sibling, 0 replies; 4+ messages in thread
From: John W. Linville @ 2009-11-30 21:20 UTC (permalink / raw)
To: Allan, Bruce W
Cc: David Miller, netdev@vger.kernel.org, Kirsher, Jeffrey T,
amit@netxen.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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-30 21:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).