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
f866fbc842de ("ipv4: fix data-races around inet->inet_id")
c274af224269 ("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
e74216b8def3 ("bonding: fix macvlan over alb bond support")
f11e5bd159b0 ("bonding: support balance-alb with openvswitch")
drivers/net/ethernet/broadcom/bgmac.c
d6499f0b7c7c ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
23a14488ea58 ("net: bgmac: Fix return value check for fixed_phy_register()")
drivers/net/ethernet/broadcom/genet/bcmmii.c
32bbe64a1386 ("net: bcmgenet: Fix return value check for fixed_phy_register()")
acf50d1adbf4 ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")
net/sctp/socket.c
f866fbc842de ("ipv4: fix data-races around inet->inet_id")
b09bde5c3554 ("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
2023-04-18 16:39:34 -07:00
2023-08-18 18:13:36 +02:00
2023-08-16 10:14:17 -07:00
2023-07-20 15:52:55 -07:00
2023-07-24 10:29:52 -04:00
2023-05-11 10:56:24 +02:00
2023-07-23 23:19:30 +00:00
2023-08-07 16:42:58 -07:00
2023-08-14 17:35:32 +02:00
2023-04-24 12:02:25 -07:00
2023-04-25 13:00:41 -07:00
2023-08-19 19:24:38 +01:00
2023-08-17 00:44:35 +02:00
2023-08-14 11:46:51 +02:00
2023-06-30 14:50:00 -07:00
2023-04-27 17:41:23 -07:00
2023-05-30 15:20:12 +01:00
2023-08-24 10:51:39 -07:00
2023-06-13 16:41:14 -04:00
2023-05-29 15:11:30 +01:00
2023-04-25 17:02:13 -04:00
2023-06-27 10:47:08 -04:00
2023-05-17 17:02:09 -10:00
57ce6427e0