Merge conflict of mlx5 resolved using instructions in merge
commit
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| hyperv_net.h | ||
| netvsc.c | ||
| netvsc_drv.c | ||
| netvsc_trace.c | ||
| netvsc_trace.h | ||
| rndis_filter.c | ||
Merge conflict of mlx5 resolved using instructions in merge
commit
|
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| hyperv_net.h | ||
| netvsc.c | ||
| netvsc_drv.c | ||
| netvsc_trace.c | ||
| netvsc_trace.h | ||
| rndis_filter.c | ||