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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/broadcom/bnxt/bnxt.c
  1e7962114c10 ("bnxt_en: Restore PTP tx_avail count in case of skb_pad() error")
  165f87691a89 ("bnxt_en: add timestamping statistics support")

No adjacent changes.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 7dc00c0d89924e44a89933932ecd527f5ab72b05,a6d69a45fa01455f751e1b6db85a6bfa9f3a6931..1f72adaef709df2606e27a55de59d36a70703358
--- 1/drivers/net/ethernet/broadcom/bnxt/bnxt.c
--- 2/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@@ -762,6 -753,8 +757,10 @@@ tx_dma_error
  tx_free:
        dev_kfree_skb_any(skb);
  tx_kick_pending:
 -      if (BNXT_TX_PTP_IS_SET(lflags))
++      if (BNXT_TX_PTP_IS_SET(lflags)) {
++              atomic64_inc(&bp->ptp_cfg->stats.ts_err);
+               atomic_inc(&bp->ptp_cfg->tx_avail);
++      }
        if (txr->kick_pending)
                bnxt_txr_db_kick(bp, txr, txr->tx_prod);
        txr->tx_buf_ring[txr->tx_prod].skb = NULL;

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

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

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/mac80211/iface.c
Simple merge

diff --cc net/mac80211/util.c
Simple merge

diff --cc net/sched/act_api.c
Simple merge

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

diff --cc tools/testing/selftests/net/Makefile
Simple merge