mirror of
https://gitee.com/openharmony/kernel_linux
synced 2025-05-19 21:26:34 +00:00

The dwmac-socfpga.c conflict was a case of a bug fix overlapping changes in net-next to handle an error pointer differently. Signed-off-by: David S. Miller <davem@davemloft.net>