mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
David S. Miller
5ca114400d
en_rx_am.c was deleted in 'net-next' but had a bug fixed in it in
'net'.
The esp{4,6}_offload.c conflicts were overlapping changes.
The 'out' label is removed so we just return ERR_PTR(-EINVAL)
directly.
Signed-off-by: David S. Miller <[email protected]>