diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-10-22 08:51:45 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-10-22 09:00:31 -0700 |
| commit | 016c89460d348c405313019bffeb73971e35ed09 (patch) | |
| tree | c1ee4e8a76805a3dc126061dccf56cef839601e9 /drivers/net/xen-netfront.c | |
| parent | b89e7f2c31ae5fe730567085da23574cb8f319ae (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>
Diffstat (limited to 'drivers/net/xen-netfront.c')
0 files changed, 0 insertions, 0 deletions