Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/intel/ice/ice_main.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ll_temac.h | ||
| ll_temac_main.c | ||
| ll_temac_mdio.c | ||
| xilinx_axienet.h | ||
| xilinx_axienet_main.c | ||
| xilinx_axienet_mdio.c | ||
| xilinx_emaclite.c | ||
Cross-merge networking fixes after downstream PR. Conflicts: drivers/net/ethernet/intel/ice/ice_main.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| ll_temac.h | ||
| ll_temac_main.c | ||
| ll_temac_mdio.c | ||
| xilinx_axienet.h | ||
| xilinx_axienet_main.c | ||
| xilinx_axienet_mdio.c | ||
| xilinx_emaclite.c | ||