linux/drivers/net/team
Jakub Kicinski 7ff57803d2 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
  fa165e1949 ("sfc: don't unregister flow_indr if it was never registered")
  3bf969e88a ("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>
2023-08-18 12:44:56 -07:00
..
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile
team_mode_activebackup.c team: change the getter function in the team_option structure to void 2023-08-08 15:04:05 -07:00
team_mode_broadcast.c team: remove unreferenced header in broadcast and roundrobin files 2023-08-08 15:04:04 -07:00
team_mode_loadbalance.c team: remove unused input parameters in lb_htpm_select_tx_port and lb_hash_select_tx_port 2023-08-08 15:04:05 -07:00
team_mode_random.c treewide: use get_random_u32_below() instead of deprecated function 2022-11-18 02:15:15 +01:00
team_mode_roundrobin.c team: remove unreferenced header in broadcast and roundrobin files 2023-08-08 15:04:04 -07:00
team.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2023-08-18 12:44:56 -07:00