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

Cross-merge networking fixes after downstream PR.

Conflicts:

drivers/net/ethernet/sfc/tc.c
  fa165e19 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e8 ("sfc: add MAE table machinery for conntrack table")
https://lore.kernel.org/all/20230818112159.7430e9b4@canb.auug.org.au/



No adjacent changes.

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