Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 May 2018 00:53:22 +0000 (20:53 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 May 2018 00:53:22 +0000 (20:53 -0400)
commitb2d6cee117f708d493c020f9f355297321507be7
tree2c6975b47034de78fc899b4191260bb2704efc0f
parentb753a9faaf9aef1338c28ebd9ace6d749428788b
parent4bc871984f7cb5b2dec3ae64b570cb02f9ce2227
Merge git://git./linux/kernel/git/davem/net

The bpf syscall and selftests conflicts were trivial
overlapping changes.

The r8169 change involved moving the added mdelay from 'net' into a
different function.

A TLS close bug fix overlapped with the splitting of the TLS state
into separate TX and RX parts.  I just expanded the tests in the bug
fix from "ctx->conf == X" into "ctx->tx_conf == X && ctx->rx_conf
== X".

Signed-off-by: David S. Miller <davem@davemloft.net>
28 files changed:
MAINTAINERS
drivers/net/bonding/bond_alb.c
drivers/net/bonding/bond_main.c
drivers/net/dsa/mv88e6xxx/chip.c
drivers/net/dsa/mv88e6xxx/chip.h
drivers/net/dsa/mv88e6xxx/global2.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/mellanox/mlx5/core/main.c
drivers/net/ethernet/qlogic/qed/qed_l2.c
drivers/net/ethernet/qlogic/qed/qed_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/hyperv/rndis_filter.c
drivers/net/phy/sfp-bus.c
include/net/flow_dissector.h
kernel/bpf/syscall.c
net/ipv4/udp.c
net/ipv6/ip6_vti.c
net/ipv6/udp.c
net/sctp/associola.c
net/sctp/sm_make_chunk.c
net/tipc/node.c
net/tipc/socket.c
net/tls/tls_main.c
net/xfrm/xfrm_state.c
tools/testing/selftests/net/Makefile