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

Trivial conflicts in net/can/isotp.c and
tools/testing/selftests/net/mptcp/mptcp_connect.sh

scaled_ppm_to_ppb() was moved from drivers/ptp/ptp_clock.c
to include/linux/ptp_clock_kernel.h in -next so re-apply
the fix there.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/fs.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

diff --cc drivers/net/ethernet/atheros/alx/main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge

diff --cc drivers/net/ethernet/lantiq_xrx200.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/rep/tc.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.h
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/mlx5dr.h
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlxsw/reg.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

diff --cc drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c
Simple merge

diff --cc drivers/net/ethernet/realtek/r8169_main.c
Simple merge

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

diff --cc drivers/net/hamradio/mkiss.c
Simple merge

diff --cc drivers/net/mhi/net.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

diff --cc drivers/net/usb/qmi_wwan.c
Simple merge

diff --cc drivers/net/usb/r8152.c
Simple merge

diff --cc drivers/net/vrf.c
Simple merge

diff --cc drivers/ptp/ptp_clock.c
Simple merge

diff --cc include/linux/device.h
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/mm_types.h
Simple merge

diff --cc include/linux/ptp_clock_kernel.h
index a311bddd9e859935305f86ad33d6e54638afeb2a,51d7f1b8b32aa6bbc7a00df25d2eb228ddd973b5..aba237c0b3a217b65e5912e0127cb4fe9f42f805
--- 1/include/linux/ptp_clock_kernel.h
--- 2/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@@ -186,32 -186,6 +186,32 @@@ struct ptp_clock_event 
        };
  };
  
- static inline s32 scaled_ppm_to_ppb(long ppm)
 +/**
 + * scaled_ppm_to_ppb() - convert scaled ppm to ppb
 + *
 + * @ppm:    Parts per million, but with a 16 bit binary fractional field
 + */
-       return (s32)ppb;
++static inline long scaled_ppm_to_ppb(long ppm)
 +{
 +      /*
 +       * The 'freq' field in the 'struct timex' is in parts per
 +       * million, but with a 16 bit binary fractional field.
 +       *
 +       * We want to calculate
 +       *
 +       *    ppb = scaled_ppm * 1000 / 2^16
 +       *
 +       * which simplifies to
 +       *
 +       *    ppb = scaled_ppm * 125 / 2^13
 +       */
 +      s64 ppb = 1 + ppm;
 +
 +      ppb *= 125;
 +      ppb >>= 13;
++      return (long)ppb;
 +}
 +
  #if IS_REACHABLE(CONFIG_PTP_1588_CLOCK)
  
  /**

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

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

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/batman-adv/bat_iv_ogm.c
Simple merge

diff --cc net/bluetooth/smp.c
Simple merge

diff --cc net/bridge/br_private.h
Simple merge

diff --cc net/can/isotp.c
index f995eaef5d7b52332f5da1a614c663040b2e5152,be6183f8ca110bca522f1ee203cc10470ff6f132..bd49299319a13398259936e845e0efdfb28c4e9d
--- 1/net/can/isotp.c
--- 2/net/can/isotp.c
+++ b/net/can/isotp.c
@@@ -1452,7 -1482,9 +1484,9 @@@ static __init int isotp_module_init(voi
  
        err = can_proto_register(&isotp_can_proto);
        if (err < 0)
 -              pr_err("can: registration of isotp protocol failed\n");
 +              pr_err("can: registration of isotp protocol failed %pe\n", ERR_PTR(err));
+       else
+               register_netdevice_notifier(&canisotp_notifier);
  
        return err;
  }

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

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

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

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

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

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

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

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

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

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

diff --cc net/mptcp/protocol.c
index 42fc7187beeef5b746a30d1d74aecea8f4022904,632350018fb6670609f9799783467f9d7f9b0f8f..b5f2f504b85bbae33a6e3f6758be619937d2aa30
--- 1/net/mptcp/protocol.c
--- 2/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@@ -286,15 -280,15 +286,17 @@@ static bool __mptcp_move_skb(struct mpt
  
        /* try to fetch required memory from subflow */
        if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
-               if (ssk->sk_forward_alloc < skb->truesize)
-                       goto drop;
-               __sk_mem_reclaim(ssk, skb->truesize);
-               if (!sk_rmem_schedule(sk, skb, skb->truesize))
+               int amount = sk_mem_pages(skb->truesize) << SK_MEM_QUANTUM_SHIFT;
+ 
+               if (ssk->sk_forward_alloc < amount)
                        goto drop;
+ 
+               ssk->sk_forward_alloc -= amount;
+               sk->sk_forward_alloc += amount;
        }
  
 +      has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp;
 +
        /* the skb map_seq accounts for the skb offset:
         * mptcp_subflow_get_mapped_dsn() is based on the current tp->copied_seq
         * value

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

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

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

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 69351c3eb68c53767b4ba5af0e5017c8c6c08501,2b495dc8d78ec76f92493d794474fcd9d34b5b77..2484fb6a9a8df67ac857bd876ba230b7b7684baa
--- 1/tools/testing/selftests/net/mptcp/mptcp_connect.sh
--- 2/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@@ -202,15 -197,6 +202,12 @@@ ip -net "$ns4" link set ns4eth3 u
  ip -net "$ns4" route add default via 10.0.3.2
  ip -net "$ns4" route add default via dead:beef:3::2
  
- # use TCP syn cookies, even if no flooding was detected.
- ip netns exec "$ns2" sysctl -q net.ipv4.tcp_syncookies=2
- 
 +if $checksum; then
 +      for i in "$ns1" "$ns2" "$ns3" "$ns4";do
 +              ip netns exec $i sysctl -q net.mptcp.checksum_enabled=1
 +      done
 +fi
 +
  set_ethtool_flags() {
        local ns="$1"
        local dev="$2"