mirror of https://github.com/torvalds/linux.git
Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c |
||
|---|---|---|
| .. | ||
| Makefile | ||
| defines.h | ||
| ethtool.c | ||
| igbvf.h | ||
| mbx.c | ||
| mbx.h | ||
| netdev.c | ||
| regs.h | ||
| vf.c | ||
| vf.h | ||
Conflicts: drivers/net/ethernet/mellanox/mlx5/core/en_tc.c |
||
|---|---|---|
| .. | ||
| Makefile | ||
| defines.h | ||
| ethtool.c | ||
| igbvf.h | ||
| mbx.c | ||
| mbx.h | ||
| netdev.c | ||
| regs.h | ||
| vf.c | ||
| vf.h | ||