netdev - Re: MERGE check, net-next-2.6...

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 30 Nov 2009 16:20:35 -0500
From:	"John W. Linville" <linville@...driver.com>
To:	"Allan, Bruce W" <bruce.w.allan@...el.com>
Cc:	David Miller <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"Kirsher, Jeffrey T" <jeffrey.t.kirsher@...el.com>,
	"amit@...xen.com" <amit@...xen.com>
Subject: Re: MERGE check, net-next-2.6...

On Mon, Nov 30, 2009 at 12:54:48PM -0800, Allan, Bruce W wrote:
> >-----Original Message-----
> >From: netdev-owner@...r.kernel.org [mailto:netdev-owner@...r.kernel.org]
> >On Behalf Of David Miller
> >Sent: Sunday, November 29, 2009 1:17 AM
> >To: netdev@...r.kernel.org
> >Cc: Kirsher, Jeffrey T; linville@...driver.com; amit@...xen.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@...driver.com			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html