mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-02-07 20:09:05 +00:00
![David S. Miller](/assets/img/avatar_default.png)
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>