]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 23 Jan 2018 18:49:06 +0000 (13:49 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 23 Jan 2018 18:51:56 +0000 (13:51 -0500)
commit5ca114400dcd46f19f31573e7c60e638bd8d644b
treed78dc56c94548d865e505f022c08006716bdb963
parentf53d77e19b6587527a3dd60a0e638f115e5cd7a9
parenta84a8ab94ed5cb65a1355fe9e8d1d55283375808
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>
MAINTAINERS
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/ibm/ibmvnic.h
net/core/dev.c
net/ipv4/esp4_offload.c
net/ipv4/igmp.c
net/ipv6/esp6_offload.c
net/rds/tcp.c
net/rds/tcp.h
net/rds/tcp_send.c