Merge git://git.kernel.org/pub/scm/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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_alb.c
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/chip.h
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx/global2.c
Simple merge

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_l2.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_main.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169.c
index 6d99b14,c7aac1f..2c2f0c5
--- 1/drivers/net/ethernet/realtek/r8169.c
--- 2/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@@ -4662,6 -4855,6 +4662,9 @@@ static void r8168_phy_power_up(struct r
                break;
        }
        rtl_writephy(tp, MII_BMCR, BMCR_ANENABLE);
++
++      /* give MAC/PHY some time to resume */
++      msleep(20);
  }
  
  static void r8168_phy_power_down(struct rtl8169_private *tp)

diff --cc drivers/net/hyperv/rndis_filter.c
Simple merge

diff --cc drivers/net/phy/sfp-bus.c
Simple merge

diff --cc include/net/flow_dissector.h
Simple merge

diff --cc kernel/bpf/syscall.c
index 9b87198,016ef90..c286e75
--- 1/kernel/bpf/syscall.c
--- 2/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@@ -27,7 -26,7 +27,8 @@@
  #include <linux/cred.h>
  #include <linux/timekeeping.h>
  #include <linux/ctype.h>
 +#include <linux/btf.h>
+ #include <linux/nospec.h>
  
  #define IS_FD_ARRAY(map) ((map)->map_type == BPF_MAP_TYPE_PROG_ARRAY || \
                           (map)->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || \

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/ip6_vti.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge

diff --cc net/sctp/associola.c
Simple merge

diff --cc net/sctp/sm_make_chunk.c
Simple merge

diff --cc net/tipc/node.c
Simple merge

diff --cc net/tipc/socket.c
Simple merge

diff --cc net/tls/tls_main.c
index 4b57ddd,20cd93b..301f224
--- 1/net/tls/tls_main.c
--- 2/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@@ -252,12 -254,8 +254,9 @@@ static void tls_sk_proto_close(struct s
        lock_sock(sk);
        sk_proto_close = ctx->sk_proto_close;
  
-       if (ctx->tx_conf == TLS_HW_RECORD && ctx->rx_conf == TLS_HW_RECORD)
-               goto skip_tx_cleanup;
- 
-       if (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE) {
-               kfree(ctx);
-               ctx = NULL;
 -      if (ctx->conf == TLS_BASE || ctx->conf == TLS_HW_RECORD) {
++      if ((ctx->tx_conf == TLS_HW_RECORD && ctx->rx_conf == TLS_HW_RECORD) ||
++          (ctx->tx_conf == TLS_BASE && ctx->rx_conf == TLS_BASE)) {
+               free_ctx = true;
                goto skip_tx_cleanup;
        }
  

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index 73af457,3ff81a4..e60dddb
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -5,13 -5,10 +5,13 @@@ CFLAGS =  -Wall -Wl,--no-as-needed -O2 
  CFLAGS += -I../../../../usr/include/
  
  TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh
- TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh udpgso.sh
 -TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh
++TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh udpgso.sh
 +TEST_PROGS += udpgso_bench.sh
- TEST_GEN_PROGS_EXTENDED := in_netns.sh
+ TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy
 +TEST_GEN_FILES += tcp_mmap tcp_inq
 +TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx
  TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
  TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict