]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3fb7559) | 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)
commitc891df052a142fb301d61a9230964d69f12da768
treec1ee4e8a76805a3dc126061dccf56cef839601e9tree | snapshot
parent3fb7559d845236f920d6ed0782c15f3fc36c6afdcommit | diff
mlx5: fix build after merge

Silent merge conflict between these two:

  4d2a216b7692 ("net/mlx5: Lag, move lag files into directory")
  65057dc7de7c ("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
Linux Kernel Source Tree.