The ungrafting from PRIO bug fixes in net, when merged into net-next, merge cleanly but create a build failure. The resolution used here is from Petr Machata. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| gve_adminq.c | ||
| gve_adminq.h | ||
| gve_desc.h | ||
| gve_ethtool.c | ||
| gve_main.c | ||
| gve_register.h | ||
| gve_rx.c | ||
| gve_tx.c | ||
| gve.h | ||
| Makefile | ||