Jakub Kicinski 57ce6427e0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Cross-merge networking fixes after downstream PR. Conflicts: include/net/inet_sock.h f866fbc842 ("ipv4: fix data-races around inet->inet_id") c274af2242 ("inet: introduce inet->inet_flags") https://lore.kernel.org/all/679ddff6-db6e-4ff6-b177-574e90d0103d@tessares.net/ Adjacent changes: drivers/net/bonding/bond_alb.c e74216b8de ("bonding: fix macvlan over alb bond support") f11e5bd159 ("bonding: support balance-alb with openvswitch") drivers/net/ethernet/broadcom/bgmac.c d6499f0b7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()") 23a14488ea ("net: bgmac: Fix return value check for fixed_phy_register()") drivers/net/ethernet/broadcom/genet/bcmmii.c 32bbe64a13 ("net: bcmgenet: Fix return value check for fixed_phy_register()") acf50d1adb ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()") net/sctp/socket.c f866fbc842 ("ipv4: fix data-races around inet->inet_id") b09bde5c35 ("inet: move inet->mc_loop to inet->inet_frags") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2023-08-24 10:51:39 -07:00
..
felix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-10 14:10:53 -07:00
felix.h	net: dsa: felix: make vsc9959_tas_guard_bands_update() visible to ocelot->ops	2023-07-06 19:10:22 -07:00
felix_vsc9959.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-24 10:51:39 -07:00
Kconfig	net: dsa: ocelot: fix selecting MFD_OCELOT	2023-02-16 13:03:15 +01:00
Makefile	net: dsa: ocelot: add external ocelot switch control	2023-01-30 21:07:21 -08:00
ocelot_ext.c	net: dsa: ocelot: add support for external phys	2023-03-20 09:08:48 +00:00
seville_vsc9953.c	net: dsa: Explicitly include correct DT includes	2023-07-26 21:54:16 -07:00