tree 50389861e2baa3ea0d91b5be49b0d370c36039d4
parent 7eec4174ff29cd42f2acfae8112f51c228545d40
parent ecb1c9cc215cb5a4390b714d8b09de637f54fa3f
author David S. Miller <davem@davemloft.net> 1381283769 -0400
committer David S. Miller <davem@davemloft.net> 1381283769 -0400

Merge branch 'sfc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

Ben Hutchings says:

====================
Some more fixes for EF10 support; hopefully the last lot:

1. Fixes for reading statistics, from Edward Cree and Jon Cooper.
2. Addition of ethtool statistics for packets dropped by the hardware
before they were associated with a specific function, from Edward Cree.
3. Only bind to functions that are in control of their associated port,
as the driver currently assumes this is the case.
====================

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