David S. Miller
authored
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 <davem@davemloft.net> Code owners
Assign users and groups as approvers for specific file changes. Learn more.