Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-10-08--09-00 (v6.12-rc1-453-g855d3eecc39a) remotes/brancher/net-next-2024-10-08--12-00 (v6.12-rc1-441-g4ac484297cbe) ==== BASE DIFF ==== .../devicetree/bindings/net/ethernet-phy.yaml | 21 + Documentation/devicetree/bindings/net/fsl,fec.yaml | 7 + Documentation/networking/diagnostic/index.rst | 17 + .../diagnostic/twisted_pair_layer1_diagnostics.rst | 767 ++++ Documentation/networking/index.rst | 1 + drivers/net/ethernet/freescale/fec_ptp.c | 11 +- drivers/net/ethernet/microchip/sparx5/Makefile | 2 +- .../ethernet/microchip/sparx5/sparx5_calendar.c | 56 +- drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c | 5 +- .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 34 +- .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 10 +- .../ethernet/microchip/sparx5/sparx5_mactable.c | 10 +- .../net/ethernet/microchip/sparx5/sparx5_main.c | 228 +- .../net/ethernet/microchip/sparx5/sparx5_main.h | 130 +- .../ethernet/microchip/sparx5/sparx5_main_regs.h | 4469 +++++++++++--------- .../net/ethernet/microchip/sparx5/sparx5_netdev.c | 15 +- .../net/ethernet/microchip/sparx5/sparx5_packet.c | 8 +- .../net/ethernet/microchip/sparx5/sparx5_pgid.c | 15 +- .../net/ethernet/microchip/sparx5/sparx5_police.c | 3 +- .../net/ethernet/microchip/sparx5/sparx5_port.c | 76 +- .../net/ethernet/microchip/sparx5/sparx5_port.h | 23 +- .../net/ethernet/microchip/sparx5/sparx5_psfp.c | 49 +- drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c | 44 +- drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 8 +- drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 2 + .../net/ethernet/microchip/sparx5/sparx5_regs.c | 219 + .../net/ethernet/microchip/sparx5/sparx5_regs.h | 244 ++ .../net/ethernet/microchip/sparx5/sparx5_sdlb.c | 15 +- .../ethernet/microchip/sparx5/sparx5_switchdev.c | 33 +- drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 8 +- .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 4 +- .../net/ethernet/microchip/sparx5/sparx5_vlan.c | 47 +- drivers/net/phy/phy-core.c | 33 + drivers/net/phy/phy_device.c | 3 + include/linux/phy.h | 1 + 35 files changed, 4387 insertions(+), 2231 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.yLaGqDpUFD b/tmp/tmp.TNWXIPJ6rw index d0165c4f3394..f104497454f7 100644 --- a/tmp/tmp.yLaGqDpUFD +++ b/tmp/tmp.TNWXIPJ6rw @@ -1,6 +1,14 @@ tc_action dbg profile patch forwarding: set timeout to 3 hours +mlx4: add gettimex64() ptp method +mlx4: update mlx4_clock_read() to provide pre/post tstamps +net: netconsole: fix wrong warning +net: dsa: refuse cross-chip mirroring operations +net: add kdoc for dev->fib_nh_head +net: lan743x: Remove duplicate check +posix-clock: Fix missing timespec64 check in pc_clock_settime() +ipv6: Remove redundant unlikely() selftests: net: rds: fix module not found net: phy: c45-tja11xx: add support for outputing RMII reference clock dt-bindings: net: tja11xx: add "nxp,rmii-refclk-out" property @@ -92,50 +100,6 @@ rtnetlink: Add ASSERT_RTNL_NET() placeholder for netdev notifier. rtnetlink: Add assertion helpers for per-netns RTNL. rtnetlink: Add per-netns RTNL. Revert "rtnetlink: add guard for RTNL" -ipv4: Retire global IPv4 hash table inet_addr_lst. -ipv4: Namespacify IPv4 address GC. -ipv4: Use per-netns hash table in inet_lookup_ifaddr_rcu(). -ipv4: Link IPv4 address to per-netns hash table. -net: phy: Validate PHY LED OPs presence before registering -net: Optimize IPv6 path in ip_neigh_for_gw() -net: phy: aquantia: allow forcing order of MDI pairs -dt-bindings: net: marvell,aquantia: add property to override MDI_CFG -net: phy: realtek: check validity of 10GbE link-partner advertisement -net: fec: make PPS channel configurable -net: fec: refactor PPS channel configuration -dt-bindings: net: fec: add pps channel property -net: sparx5: redefine internal ports and PGID's as offsets -net: sparx5: add is_sparx5 macro and use it throughout -net: sparx5: ops out function for DSM calendar calculation -net: sparx5: ops out PTP IRQ handler -net: sparx5: ops out function for setting the port mux -net: sparx5: ops out functions for getting certain array values -net: sparx5: ops out chip port to device index/bit functions -net: sparx5: add ops to match data -net: sparx5: use SPX5_CONST for constants which do not have a symbol -net: sparx5: use SPX5_CONST for constants which already have a symbol -net: sparx5: add constants to match data -net: sparx5: add *sparx5 argument to a few functions -net: sparx5: modify SPX5_PORTS_ALL macro -net: sparx5: add indirection layer to register macros -net: sparx5: add support for private match data -Documentation: networking: add Twisted Pair Ethernet diagnostics at OSI Layer 1 -idpf: Don't hard code napi_struct size -net: pcs: xpcs: move Wangxun VR_XS_PCS_DIG_CTRL1 configuration -net: pcs: xpcs: correctly place DW_VR_MII_DIG_CTRL1_2G5_EN -net: pcs: xpcs: use dev_*() to print messages -net: pcs: xpcs: convert to use read_poll_timeout() -net: pcs: xpcs: add _modify() accessors -net: pcs: xpcs: use FIELD_PREP() and FIELD_GET() -net: pcs: xpcs: move searching ID list out of line -net: pcs: xpcs: rename xpcs_get_id() -net: pcs: xpcs: move definition of struct dw_xpcs to private header -net: pcs: xpcs: provide a helper to get the phylink pcs given xpcs -net: pcs: xpcs: pass xpcs instead of xpcs->id to xpcs_find_compat() -net: pcs: xpcs: don't use array for interface -net: pcs: xpcs: remove dw_xpcs_compat enum -net: phy: Add support for PHY timing-role configuration via device tree -dt-bindings: net: ethernet-phy: Add timing-role role property for ethernet PHYs bnxt_en: Pass NQ ID to the FW when allocating RX/RX AGG rings bnxt_en: Add TPH support in BNXT driver PCI/TPH: Add TPH documentation