mlx5: fix build after merge

Browse source

Silent merge conflict between these two:

  3d677735d3 ("net/mlx5: Lag, move lag files into directory")
  14fe2471c6 ("net/mlx5: Lag, change multipath and bonding to be mutually exclusive")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

...

This commit is contained in:

Jakub Kicinski 2021-10-22 08:51:45 -07:00

parent b89e7f2c31

commit 016c89460d

2 changed files with 4 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

View file

4

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

View file