commit | 5ca114400dcd46f19f31573e7c60e638bd8d644b | [log] [tgz] |
---|---|---|
author | David S. Miller <davem@davemloft.net> | Tue Jan 23 13:49:06 2018 -0500 |
committer | David S. Miller <davem@davemloft.net> | Tue Jan 23 13:51:56 2018 -0500 |
tree | d78dc56c94548d865e505f022c08006716bdb963 | |
parent | f53d77e19b6587527a3dd60a0e638f115e5cd7a9 [diff] | |
parent | a84a8ab94ed5cb65a1355fe9e8d1d55283375808 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 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>