tree abaedb7f2ddf75914659c7b9a48af34ca89a9208
parent c5b9f4792ea6b9abfcfb9486ba256f55e296aaa7
parent d3fa86b1a7b4cdc4367acacea16b72e0a200b3d7
author Jakub Kicinski <kuba@kernel.org> 1700770789 -0800
committer Jakub Kicinski <kuba@kernel.org> 1700770858 -0800

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>