mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08: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>