diff options
| author | Jakub Kicinski <[email protected]> | 2024-08-08 14:03:51 -0700 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-08-15 17:18:52 -0700 |
| commit | 4d3d3559fc7a56226d8a83ee68d72a900afd42c4 (patch) | |
| tree | 22298b5419a71ff40f756b1748bd12c783804bca /tools/perf/scripts/python | |
| parent | a9c60712d71ff07197b2982899b9db28ed548ded (diff) | |
| parent | a4a35f6cbebbf9466b6c412506ab89299d567f51 (diff) | |
Merge git://git.kernel.org/pub/scm/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/[email protected]
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/[email protected]
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/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions