Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Tue, 25 Jun 2013 23:11:41 +0000 (16:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 25 Jun 2013 23:11:41 +0000 (16:11 -0700)
commit3bae9db9aacc40cdb5a0a4b74aaf935b3e85b4d6
treebda7c296a23fa0d009ab3c97d1c84aa47b2bcc6a
parent6541aa52a0f9911b0d9d9df14b1da3147a98f58b
parent636d73da27e83ce4882f8823f79063bb37980961
Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
1. Make EEH recovery work when using legacy interrupts, from Alexandre
   Rames.

2. Enable accelerated RFS for VLAN-tagged flows, from Andy Lutomirski.

3. Improve performance for non-TCP (and particularly UDP) traffic, which
   regressed in 3.10 when we switched to always allocating paged RX
   buffers.  Partly by Jon Cooper.

4. Some minor bug fixes to IOMMU detection, timestamping capabilities,
   and IRQ cleanup on the probe failure path.

I've dropped the RX skb cache, which improved some benchmarks but
perhaps needs some reworking to be more generally useful.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>