mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-12-14 10:40:18 +00:00
Conflicts: drivers/net/ethernet/mediatek/mtk_eth_soc.c drivers/net/ethernet/qlogic/qed/qed_dcbx.c drivers/net/phy/Kconfig All conflicts were cases of overlapping commits. Signed-off-by: David S. Miller <davem@davemloft.net> |
||
|---|---|---|
| .. | ||
| ah.c | ||
| cq.c | ||
| doorbell.c | ||
| gsi.c | ||
| ib_virt.c | ||
| Kconfig | ||
| mad.c | ||
| main.c | ||
| Makefile | ||
| mem.c | ||
| mlx5_ib.h | ||
| mr.c | ||
| odp.c | ||
| qp.c | ||
| srq.c | ||
| user.h | ||