diff options
author | 2020-01-26 10:40:21 +0100 | |
---|---|---|
committer | 2020-01-26 10:40:21 +0100 | |
commit | 4d8773b68e83558025303f266070b31bc4101e73 (patch) | |
tree | 151cafa469fbc6a411d36b58ab802f67869cc0bb /drivers/net/ethernet/intel/ice/ice_ethtool.c | |
parent | Merge branch 'mlxsw-Offload-TBF' (diff) | |
parent | Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm (diff) | |
download | linux-dev-4d8773b68e83558025303f266070b31bc4101e73.tar.xz linux-dev-4d8773b68e83558025303f266070b31bc4101e73.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in mlx5 because changes happened to code that has
moved meanwhile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/ice/ice_ethtool.c')
0 files changed, 0 insertions, 0 deletions