Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Overlapping changes in selftests Makefile.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bcmsysport.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
Simple merge

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

diff --cc net/bridge/br_if.c
Simple merge

diff --cc net/core/ethtool.c
Simple merge

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

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

diff --cc net/smc/af_smc.c
index 823ea33715759fe6b3a0d7a23c99006e2de26b86,544bab42f925a1eb90ac537a1eee7398e92a7c9f..95b00e4c3396bbec14c09d8c8e15dbaff923df9c
--- 1/net/smc/af_smc.c
--- 2/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@@ -293,9 -292,19 +293,20 @@@ static void smc_copy_sock_settings_to_s
        smc_copy_sock_settings(&smc->sk, smc->clcsock->sk, SK_FLAGS_CLC_TO_SMC);
  }
  
+ /* register a new rmb */
+ static int smc_reg_rmb(struct smc_link *link, struct smc_buf_desc *rmb_desc)
+ {
+       /* register memory region for new rmb */
+       if (smc_wr_reg_send(link, rmb_desc->mr_rx[SMC_SINGLE_LINK])) {
+               rmb_desc->regerr = 1;
+               return -EFAULT;
+       }
+       return 0;
+ }
+ 
  static int smc_clnt_conf_first_link(struct smc_sock *smc)
  {
 +      struct net *net = sock_net(smc->clcsock->sk);
        struct smc_link_group *lgr = smc->conn.lgr;
        struct smc_link *link;
        int rest;

diff --cc net/smc/smc_core.c
Simple merge

diff --cc net/smc/smc_core.h
Simple merge

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

diff --cc net/tls/tls_main.c
Simple merge

diff --cc tools/testing/selftests/bpf/test_progs.c
Simple merge

diff --cc tools/testing/selftests/net/Makefile
index 0a1821f8dfb18604c34beca9e1d000947c5bbf1d,daf5effec3f07d7d67e58d15571e15defd749814..902820d3e848497e81983695b9948486d4eb8dff
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -5,14 -5,12 +5,15 @@@ 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 pmtu.sh
 +TEST_PROGS += fib_tests.sh fib-onlink-tests.sh in_netns.sh pmtu.sh udpgso.sh
 +TEST_PROGS += udpgso_bench.sh
+ TEST_GEN_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_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa
  TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict
 +TEST_GEN_PROGS += udpgso udpgso_bench_tx udpgso_bench_rx
  
  include ../lib.mk