From: David S. Miller Date: Tue, 17 Dec 2013 22:08:21 +0000 (-0500) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=baf9573e6794a979ba1b9bb8a1221c56ceb1bc79;p=linux-beck.git Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next Ben Hutchings says: ==================== Miscellaneous changes for 3.14: 1. Add more information to some WARN messages. 2. Refactor pushing of RSS configuration, from Andrew Rybchenko. 3. Refactor handling of automatic (device address list) vs manual (RX NFC) MAC filters. 4. Implement clearing of manual RX filters on EF10 when ntuple offload is disabled. 5. Remove definitions that are unused since the RX buffer allocation changes, from Andrew Rybchenko. 6. Improve naming of some statistics, from Shradha Shah. 7. Add statistics for PTP support code. 8. Fix insertion of RX drop filters on EF10. ==================== Signed-off-by: David S. Miller --- baf9573e6794a979ba1b9bb8a1221c56ceb1bc79