This is the correct resolution for the conflict from merging the "net" tree fix: commit |
||
---|---|---|
.. | ||
enetc_cbdr.c | ||
enetc_ethtool.c | ||
enetc_hw.h | ||
enetc_mdio.c | ||
enetc_msg.c | ||
enetc_pci_mdio.c | ||
enetc_pf.c | ||
enetc_pf.h | ||
enetc_ptp.c | ||
enetc_qos.c | ||
enetc_vf.c | ||
enetc.c | ||
enetc.h | ||
Kconfig | ||
Makefile |