From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: David Miller <davem@davemloft.net>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"gospo@redhat.com" <gospo@redhat.com>
Subject: Re: [net-next 0/6][pull request] Intel Wired LAN Driver Update
Date: Sat, 20 Aug 2011 19:55:36 -0700 [thread overview]
Message-ID: <1313895336.2128.194.camel@jtkirshe-mobl> (raw)
In-Reply-To: <20110820.172919.1482966002228420753.davem@davemloft.net>
[-- Attachment #1: Type: text/plain, Size: 819 bytes --]
On Sat, 2011-08-20 at 17:29 -0700, David Miller wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.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.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
next prev parent reply other threads:[~2011-08-21 2:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-19 13:11 [net-next 0/6][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-08-19 13:11 ` [net-next 1/6] e1000e: convert driver to use extended descriptors Jeff Kirsher
2011-08-19 13:11 ` [net-next 2/6] e1000e: bump driver version number Jeff Kirsher
2011-08-19 13:11 ` [net-next 3/6] ixgbe - DDP last user buffer - error to warn Jeff Kirsher
2011-08-19 13:11 ` [net-next 4/6] ixgbe: Refactor transmit map and cleanup routines Jeff Kirsher
2011-08-19 13:11 ` [net-next 5/6] ixgbe: replace reference to CONFIG_FCOE with IXGBE_FCOE Jeff Kirsher
2011-08-19 13:11 ` [net-next 6/6] ixgbe: Cleanup FCOE and VLAN handling in xmit_frame_ring Jeff Kirsher
2011-08-21 0:29 ` [net-next 0/6][pull request] Intel Wired LAN Driver Update David Miller
2011-08-21 2:55 ` Jeff Kirsher [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-27 7:09 Jeff Kirsher
2011-08-27 16:10 ` David Miller
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=1313895336.2128.194.camel@jtkirshe-mobl \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.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 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).