Skip to content
Snippets Groups Projects
user avatar
Jakub Kicinski authored
Cross-merge networking fixes after downstream PR.

Conflicts:

include/net/inet_sock.h
  f866fbc8 ("ipv4: fix data-races around inet->inet_id")
  c274af22 ("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
  e74216b8 ("bonding: fix macvlan over alb bond support")
  f11e5bd1 ("bonding: support balance-alb with openvswitch")

drivers/net/ethernet/broadcom/bgmac.c
  d6499f0b ("net: bgmac: Return PTR_ERR() for fixed_phy_register()")
  23a14488 ("net: bgmac: Fix return value check for fixed_phy_register()")

drivers/net/ethernet/broadcom/genet/bcmmii.c
  32bbe64a ("net: bcmgenet: Fix return value check for fixed_phy_register()")
  acf50d1a ("net: bcmgenet: Return PTR_ERR() for fixed_phy_register()")

net/sctp/socket.c
  f866fbc8 ("ipv4: fix data-races around inet->inet_id")
  b09bde5c ("inet: move inet->mc_loop to inet->inet_frags")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
57ce6427
History
Name Last commit Last update