Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorJakub Kicinski <kuba@kernel.org>
Thu, 8 Aug 2024 21:03:51 +0000 (14:03 -0700)
committerJakub Kicinski <kuba@kernel.org>
Fri, 16 Aug 2024 00:18:52 +0000 (17:18 -0700)
commit4d3d3559fc7a56226d8a83ee68d72a900afd42c4
tree22298b5419a71ff40f756b1748bd12c783804bca
parenta9c60712d71ff07197b2982899b9db28ed548ded
parenta4a35f6cbebbf9466b6c412506ab89299d567f51
Merge git://git./linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
  c25504a0ba36 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys")
  be034ee6c33d ("dt-bindings: net: fsl,qoriq-mc-dpmac: using unevaluatedProperties")
https://lore.kernel.org/20240815110934.56ae623a@canb.auug.org.au

drivers/net/dsa/vitesse-vsc73xx-core.c
  5b9eebc2c7a5 ("net: dsa: vsc73xx: pass value in phy_write operation")
  fa63c6434b6f ("net: dsa: vsc73xx: check busy flag in MDIO operations")
  2524d6c28bdc ("net: dsa: vsc73xx: use defined values in phy operations")
https://lore.kernel.org/20240813104039.429b9fe6@canb.auug.org.au
Resolve by using FIELD_PREP(), Stephen's resolution is simpler.

Adjacent changes:

net/vmw_vsock/af_vsock.c
  69139d2919dd ("vsock: fix recursive ->recvmsg calls")
  744500d81f81 ("vsock: add support for SIOCOUTQ ioctl")

Link: https://patch.msgid.link/20240815141149.33862-1-pabeni@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml
MAINTAINERS
drivers/net/dsa/vitesse-vsc73xx-core.c
drivers/net/ethernet/cadence/macb_main.c
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/xilinx/xilinx_axienet.h
drivers/net/phy/vitesse.c
include/net/af_vsock.h
net/vmw_vsock/af_vsock.c