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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  c9663f79cd82 ("ice: adjust switchdev rebuild path")
  7758017911a4 ("ice: restore timestamp configuration after device reset")
https://lore.kernel.org/all/20231121211259.3348630-1-anthony.l.nguyen@intel.com/

Adjacent changes:

kernel/bpf/verifier.c
  bb124da69c47 ("bpf: keep track of max number of bpf_loop callback iterations")
  5f99f312bd3b ("bpf: add register bounds sanity checks and sanitization")

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

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

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
index 10822011de22100a3922d1cacb8725e58fd7b18d,fb9c93f37e84f7f0e9e1d960522aaae1601f98ca..43ba3e55b8c1f3cd45c78896c8089c7e7fb167d1
--- 1/drivers/net/ethernet/intel/ice/ice_main.c
--- 2/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@@ -7403,18 -7401,9 +7403,9 @@@ static void ice_rebuild(struct ice_pf *
                goto err_vsi_rebuild;
        }
  
-       /* configure PTP timestamping after VSI rebuild */
-       if (test_bit(ICE_FLAG_PTP_SUPPORTED, pf->flags)) {
-               if (pf->ptp.tx_interrupt_mode == ICE_PTP_TX_INTERRUPT_SELF)
-                       ice_ptp_cfg_timestamp(pf, false);
-               else if (pf->ptp.tx_interrupt_mode == ICE_PTP_TX_INTERRUPT_ALL)
-                       /* for E82x PHC owner always need to have interrupts */
-                       ice_ptp_cfg_timestamp(pf, true);
-       }
- 
 -      err = ice_vsi_rebuild_by_type(pf, ICE_VSI_SWITCHDEV_CTRL);
 +      err = ice_eswitch_rebuild(pf);
        if (err) {
 -              dev_err(dev, "Switchdev CTRL VSI rebuild failed: %d\n", err);
 +              dev_err(dev, "Switchdev rebuild failed: %d\n", err);
                goto err_vsi_rebuild;
        }
  

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

diff --cc drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Simple merge

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

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

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

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

diff --cc kernel/cgroup/cgroup.c
Simple merge

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