netdev - Re: [net-next 0/6][pull request] Intel Wired LAN Driver Update

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 linux-cve-announce 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]

Message-ID: <1313895336.2128.194.camel@jtkirshe-mobl>
Date:	Sat, 20 Aug 2011 19:55:36 -0700
From:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
To:	David Miller <davem@...emloft.net>
Cc:	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"gospo@...hat.com" <gospo@...hat.com>
Subject: Re: [net-next 0/6][pull request] Intel Wired LAN Driver Update

On Sat, 2011-08-20 at 17:29 -0700, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
> Date: Fri, 19 Aug 2011 06:11:20 -0700
> 
> > The following series contains updates to e1000e and ixgbe.
> > 
> > The following are changes since commit ae1511bf769cafeae5ab61aaf9947a16a22cbd10:
> >   net: rps: support PPPOE session messages
> > and are available in the git repository at:
> >   master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next master
> 
> I had done a net --> net-next merge right before pulling this so there
> was a slight merge conflict, which I think I resolved correctly.
> 
> Please double-check my work.
> 
> Thanks.

I knew the e1000e driver version would conflict as soon as a I saw you
updated against net.

e1000e and ixgbe look good, thanks Dave.

Download attachment "signature.asc" of type "application/pgp-signature" (491 bytes)