From: David S. Miller <davem@davemloft.net>
Date: Tue, 12 Mar 2013 09:14:44 +0000 (-0400)
Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc... 
X-Git-Tag: upstream/snapshot3+hdmi~5164^2~515
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30129cf28a5c99f9cb7c168f0d280f147fd6cc8b;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
1. Merge sfc changes (only) accepted for 3.9.

2. PTP improvements from Laurence Evans.

3. Overhaul of RX buffer management:
- Always allocate pages, and enable scattering where possible
- Fit as many buffers as will fit into a page, rather than limiting to 2
- Introduce recycle rings to reduce the need for IOMMU mapping and
  unmapping

4. PCI error recovery (AER and EEH) implementation.

5. Fix a bug in RX filter replacement.

6. Fix configuration with 1 RX queue in the PF and multiple RX queues in
VFs.
====================

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

30129cf28a5c99f9cb7c168f0d280f147fd6cc8b