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
..
bcmgenet_wol.c	net: bcmgenet: Add support for PHY-based Wake-on-LAN	2023-05-13 16:56:29 +01:00
bcmgenet.c	net: bcmgenet: Remove TX ring full logging	2023-07-31 14:42:08 -07:00
bcmgenet.h	net: bcmgenet: Fix EEE implementation	2023-06-07 21:53:14 -07:00
bcmmii.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2023-08-24 10:51:39 -07:00
Makefile	treewide: Add SPDX license identifier - Makefile/Kconfig	2019-05-21 10:50:46 +02:00