mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2026-01-06 03:53:44 +00:00
r8152 conflicts are the NAPI fixes in 'net' overlapping with some tasklet stuff in net-next Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| enetc_cbdr.c | ||
| enetc_ethtool.c | ||
| enetc_hw.h | ||
| enetc_mdio.c | ||
| enetc_mdio.h | ||
| enetc_msg.c | ||
| enetc_pci_mdio.c | ||
| enetc_pf.c | ||
| enetc_pf.h | ||
| enetc_ptp.c | ||
| enetc_vf.c | ||
| enetc.c | ||
| enetc.h | ||
| Kconfig | ||
| Makefile | ||