mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-01-20 09:59:27 -05:00
Conflicts: drivers/net/ethernet/freescale/fec_main.c6ead9c98ca("net: fec: remove the xdp_return_frame when lack of tx BDs")144470c88c("net: fec: using the standard return codes when xdp xmit errors") Signed-off-by: Jakub Kicinski <kuba@kernel.org>