From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 23 Nov 2023 20:19:49 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=45c226dde742a92e22dcd65b96bf7e02620a9c19;p=linux.git

Merge git://git./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>
---

45c226dde742a92e22dcd65b96bf7e02620a9c19
diff --cc drivers/net/ethernet/intel/ice/ice_main.c
index 10822011de221,fb9c93f37e84f..43ba3e55b8c1f
--- a/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;
  	}