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

Minor conflicts in net/mptcp/protocol.h and
tools/testing/selftests/net/Makefile.

In both cases code was added on both sides in the same place
so just keep both.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc drivers/net/dsa/microchip/ksz_common.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/en_rx.c
Simple merge

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

diff --cc drivers/net/ethernet/ti/tlan.c
Simple merge

diff --cc drivers/net/ipa/ipa_endpoint.c
Simple merge

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

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

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

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

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

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

diff --cc net/mptcp/options.c
Simple merge

diff --cc net/mptcp/protocol.c
Simple merge

diff --cc net/mptcp/protocol.h
index aa0ab18,9724636..13ab89d
--- 1/net/mptcp/protocol.h
--- 2/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@@ -211,10 -203,9 +212,11 @@@ struct mptcp_sock 
        bool            fully_established;
        bool            rcv_data_fin;
        bool            snd_data_fin_enable;
+       bool            use_64bit_ack; /* Set when we received a 64-bit DSN */
        spinlock_t      join_list_lock;
        struct work_struct work;
 +      struct sk_buff  *ooo_last_skb;
 +      struct rb_root  out_of_order_queue;
        struct list_head conn_list;
        struct list_head rtx_queue;
        struct list_head join_list;
@@@ -309,10 -294,9 +311,9 @@@ struct mptcp_subflow_context 
                map_valid : 1,
                mpc_map : 1,
                backup : 1,
 -              data_avail : 1,
                rx_eof : 1,
-               use_64bit_ack : 1, /* Set when we received a 64-bit DSN */
                can_ack : 1;        /* only after processing the remote a key */
 +      enum mptcp_data_avail data_avail;
        u32     remote_nonce;
        u64     thmac;
        u32     local_nonce;
@@@ -365,13 -349,11 +366,14 @@@ void mptcp_subflow_fully_established(st
                                     struct mptcp_options_received *mp_opt);
  bool mptcp_subflow_data_available(struct sock *sk);
  void __init mptcp_subflow_init(void);
 +void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how);
 +void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
 +                     struct mptcp_subflow_context *subflow,
 +                     long timeout);
+ void mptcp_subflow_reset(struct sock *ssk);
  
  /* called with sk socket lock held */
 -int __mptcp_subflow_connect(struct sock *sk, int ifindex,
 -                          const struct mptcp_addr_info *loc,
 +int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_addr_info *loc,
                            const struct mptcp_addr_info *remote);
  int mptcp_subflow_create_socket(struct sock *sk, struct socket **new_sock);
  

diff --cc net/mptcp/subflow.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

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

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

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

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

diff --cc tools/testing/selftests/net/Makefile
index 4773ce7,3e7fb1e..ef35247
--- 1/tools/testing/selftests/net/Makefile
--- 2/tools/testing/selftests/net/Makefile
+++ b/tools/testing/selftests/net/Makefile
@@@ -19,7 -19,7 +19,8 @@@ TEST_PROGS += txtimestamp.s
  TEST_PROGS += vrf-xfrm-tests.sh
  TEST_PROGS += rxtimestamp.sh
  TEST_PROGS += devlink_port_split.py
 +TEST_PROGS += drop_monitor_tests.sh
+ TEST_PROGS += vrf_route_leaking.sh
  TEST_PROGS_EXTENDED := in_netns.sh
  TEST_GEN_FILES =  socket nettest
  TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any