Merge remote-tracking branch 'mfischer/ethtool' into next