Forked from
drm / kernel
Source project has a limited visibility.
-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authored
Cross-merge networking fixes after downstream PR. Conflicts: Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml c25504a0 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys") be034ee6 ("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 5b9eebc2 ("net: dsa: vsc73xx: pass value in phy_write operation") fa63c643 ("net: dsa: vsc73xx: check busy flag in MDIO operations") 2524d6c2 ("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 69139d29 ("vsock: fix recursive ->recvmsg calls") 744500d8 ("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>
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netJakub Kicinski authoredCross-merge networking fixes after downstream PR. Conflicts: Documentation/devicetree/bindings/net/fsl,qoriq-mc-dpmac.yaml c25504a0 ("dt-bindings: net: fsl,qoriq-mc-dpmac: add missed property phys") be034ee6 ("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 5b9eebc2 ("net: dsa: vsc73xx: pass value in phy_write operation") fa63c643 ("net: dsa: vsc73xx: check busy flag in MDIO operations") 2524d6c2 ("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 69139d29 ("vsock: fix recursive ->recvmsg calls") 744500d8 ("vsock: add support for SIOCOUTQ ioctl") Link: https://patch.msgid.link/20240815141149.33862-1-pabeni@redhat.com Signed-off-by:
