Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c |
||
|---|---|---|
| .. | ||
| netxen | ||
| qed | ||
| qede | ||
| qlcnic | ||
| Kconfig | ||
| Makefile | ||
| qla3xxx.c | ||
| qla3xxx.h | ||
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt.c |
||
|---|---|---|
| .. | ||
| netxen | ||
| qed | ||
| qede | ||
| qlcnic | ||
| Kconfig | ||
| Makefile | ||
| qla3xxx.c | ||
| qla3xxx.h | ||