diff options
| author |   David S. Miller <davem@davemloft.net> | 2013-12-14 01:11:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-14 01:11:22 -0500 |
| commit | 59bcaed5f71f002d39d151ccd387dd0f226e00f2 (patch) | |
| tree | 8994f8c293508b9e925d6c3e30f057efd1df2d07 /net | |
| parent | Merge branch 'bonding_netlink' (diff) | |
| parent | sfc: Remove dependency of PTP on having a dedicated channel (diff) | |
| download | linux-dev-59bcaed5f71f002d39d151ccd387dd0f226e00f2.tar.xz linux-dev-59bcaed5f71f002d39d151ccd387dd0f226e00f2.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Ben Hutchings says:
====================
An assortment of changes for Linux 3.14:
1. Merge the sfc fixes that you have already merged into net.git.
(The branch point for those was such that this does not bring in any
other changes.)
2. Reduce log level for a generally useless warning message, from
Robert Stonehouse.
3. Include BISTs in ethtool offline self-test for EF10 and recover from
BISTs initiated through other functions, from Jon Cooper.
4. Improve a sanity check on RX completions.
5. Avoid incrementing RX dropped count while the interface is down, from
Jon Cooper.
6. Improve hardware sensor naming and log messages, from Edward Cree.
7. Log all unexpected errors returned by firmware, from Edward Cree.
8. Expose another NVRAM partition to userland.
9. Some refactoring of the PTP code in preparation for EF10 support.
10. Various minor cleanups.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions