Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 24 Aug 2023 17:46:29 +0000 (10:46 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 24 Aug 2023 17:51:39 +0000 (10:51 -0700)
commit57ce6427e00a6a72f74b29630b39548b36980b09
tree4f09d27db19c7c6688764dee7fd1955a37ed4774
parent9f6708a668186dc5b38532fc1d1ff2f5311722d6
parentb5cc3833f13ace75e26e3f7b51cd7b6da5e9cf17
Merge git://git./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>
32 files changed:
MAINTAINERS
drivers/leds/trigger/ledtrig-netdev.c
drivers/net/bonding/bond_alb.c
drivers/net/dsa/mt7530.c
drivers/net/dsa/ocelot/felix_vsc9959.c
drivers/net/ethernet/broadcom/bgmac.c
drivers/net/ethernet/broadcom/genet/bcmmii.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/intel/ice/ice_base.c
drivers/net/ethernet/intel/ice/ice_vf_lib.c
drivers/net/ethernet/intel/ice/ice_virtchnl.c
drivers/net/ethernet/mediatek/mtk_wed.c
drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_keys.c
drivers/net/ethernet/mellanox/mlxsw/reg.h
drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_keys.c
drivers/net/ethernet/sfc/selftest.c
drivers/net/phy/phy.c
drivers/net/veth.c
include/net/inet_sock.h
include/net/sock.h
net/batman-adv/hard-interface.c
net/batman-adv/netlink.c
net/batman-adv/soft-interface.c
net/batman-adv/types.h
net/core/rtnetlink.c
net/dccp/ipv4.c
net/devlink/leftover.c
net/ipv4/af_inet.c
net/ipv4/tcp_ipv4.c
net/netfilter/nf_tables_api.c
net/sctp/socket.c