mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-02-22 04:33:08 +00:00

Conflicts: drivers/net/ethernet/cadence/macb.c Overlapping changes in macb driver, mostly fixes and cleanups in 'net' overlapping with the integration of at91_ether into macb in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>