Skip to content
Commit 45c226dd authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/intel/ice/ice_main.c
  c9663f79 ("ice: adjust switchdev rebuild path")
  77580179 ("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
  bb124da6 ("bpf: keep track of max number of bpf_loop callback iterations")
  5f99f312 ("bpf: add register bounds sanity checks and sanitization")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c5b9f479 d3fa86b1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment