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

No conflicts.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/can/m_can/m_can.c
index 4f90e17,7931f9c..afaaeb6
--- 1/drivers/net/can/m_can/m_can.c
--- 2/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@@ -1348,10 -1348,12 +1348,12 @@@ static void m_can_chip_config(struct ne
        /* set bittiming params */
        m_can_set_bittiming(dev);
  
 -      /* enable internal timestamp generation, with a prescalar of 16. The
 -       * prescalar is applied to the nominal bit timing
 +      /* enable internal timestamp generation, with a prescaler of 16. The
 +       * prescaler is applied to the nominal bit timing
         */
-       m_can_write(cdev, M_CAN_TSCC, FIELD_PREP(TSCC_TCP_MASK, 0xf));
+       m_can_write(cdev, M_CAN_TSCC,
+                   FIELD_PREP(TSCC_TCP_MASK, 0xf) |
+                   FIELD_PREP(TSCC_TSS_MASK, TSCC_TSS_INTERNAL));
  
        m_can_config_endisable(cdev, false);
  

diff --cc drivers/net/can/xilinx_can.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e.h
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
Simple merge

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

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

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

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

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

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

diff --cc net/tls/tls_sw.c
index 79043bc,e30649f..f1777d6
--- 1/net/tls/tls_sw.c
--- 2/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@@ -1593,20 -1576,16 +1590,23 @@@ static int decrypt_skb_update(struct so
        }
  
        err = decrypt_internal(sk, skb, dest, NULL, darg);
-       if (err < 0)
+       if (err < 0) {
+               if (err == -EBADMSG)
+                       TLS_INC_STATS(sock_net(sk), LINUX_MIB_TLSDECRYPTERROR);
                return err;
+       }
        if (darg->async)
                goto decrypt_next;
 +      /* If opportunistic TLS 1.3 ZC failed retry without ZC */
 +      if (unlikely(darg->zc && prot->version == TLS_1_3_VERSION &&
 +                   darg->tail != TLS_RECORD_TYPE_DATA)) {
 +              darg->zc = false;
 +              TLS_INC_STATS(sock_net(sk), LINUX_MIN_TLSDECRYPTRETRY);
 +              return decrypt_skb_update(sk, skb, dest, darg);
 +      }
  
  decrypt_done:
 -      pad = padding_length(prot, skb);
 +      pad = tls_padding_length(prot, skb, darg);
        if (pad < 0)
                return pad;