OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b89e7f2) | patch
mlx5: fix build after merge
authorJakub Kicinski <kuba@kernel.org>
Fri, 22 Oct 2021 15:51:45 +0000 (08:51 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 22 Oct 2021 16:00:31 +0000 (09:00 -0700)
commit016c89460d348c405313019bffeb73971e35ed09
treec1ee4e8a76805a3dc126061dccf56cef839601e9tree | snapshot
parentb89e7f2c31ae5fe730567085da23574cb8f319aecommit | diff
mlx5: fix build after merge

Silent merge conflict between these two:

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

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c diff | blob | history
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c diff | blob | history
About OSDN
Find Software
Develop Software
Help