Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-15--03-00 (v6.12-rc7-1712-ga774ebbce1f8) remotes/brancher/net-next-2024-11-15--15-00 (v6.12-rc7-1719-g6a2171272111) ==== BASE DIFF ==== .../devicetree/bindings/net/mdio-mux-gpio.yaml | 32 ---- Documentation/devicetree/bindings/net/sff,sfp.yaml | 2 +- drivers/net/ethernet/freescale/enetc/enetc_vf.c | 8 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/microchip/lan969x/Kconfig | 2 +- drivers/net/ethernet/microchip/lan969x/Makefile | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 6 + drivers/net/ethernet/realtek/r8169_phy_config.c | 16 +- drivers/net/ethernet/sfc/ef100_ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool.c | 1 + drivers/net/mdio.c | 172 -------------------- drivers/net/phy/dp83869.c | 20 ++- drivers/net/phy/micrel.c | 2 +- drivers/net/phy/phy-c45.c | 12 +- drivers/net/phy/phy-core.c | 21 ++- include/linux/ethtool.h | 4 + include/linux/mdio.h | 19 --- include/linux/phy.h | 19 ++- net/core/filter.c | 90 ++++++----- net/core/lwt_bpf.c | 2 +- net/ethtool/common.c | 42 +++-- net/ethtool/ioctl.c | 5 + tools/net/ynl/cli.py | 20 ++- tools/net/ynl/lib/ynl.py | 57 ++++--- tools/testing/selftests/bpf/prog_tests/mptcp.c | 42 ++--- tools/testing/selftests/bpf/test_sockmap.c | 180 +++++++++++++++++++-- tools/testing/selftests/drivers/net/hw/rss_ctx.py | 79 ++++++++- 27 files changed, 450 insertions(+), 408 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.Ne3BupsiNP b/tmp/tmp.2lL7Jy0Pfd index 84d41a9bd3e1..556b0f7c9e6c 100644 --- a/tmp/tmp.Ne3BupsiNP +++ b/tmp/tmp.2lL7Jy0Pfd @@ -3,21 +3,49 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours -selftests: net: netlink-dumps: validation checks -net/neighbor: clear error in case strict check is not set +ixgbe: Correct BASE-BX10 compliance code +stmmac: dwmac-intel-plat: remove redundant dwmac->data check in probe net: Comment copy_from_sockptr() explaining its behaviour rxrpc: Improve setsockopt() handling of malformed user input llc: Improve setsockopt() handling of malformed user input -bluetooth: Improve setsockopt() handling of malformed user input -net/mlx5: Manage TC arbiter nodes and implement full support for tc-bw -net/mlx5: Add traffic class scheduling support for vport QoS -net/mlx5: Add support for setting tc-bw on nodes -net/mlx5: Add support for new scheduling elements -net/mlx5: Add no-op implementation for setting tc-bw on rate objects -devlink: Extend devlink rate API with traffic classes bandwidth management -net/mlx5: DR, add support for ConnectX-8 steering -net/mlx5: DR, expand SWS STE callbacks and consolidate common structs -Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next +Bluetooth: Improve setsockopt() handling of malformed user input +wireguard: allowedips: Fix useless call issue +rtase: Add defines for hardware version id +rtase: Corrects error handling of the rtase_check_mac_version_valid() +rtase: Add support for RTL907XD-VA PCIe port +rtase: Correct the speed for RTL907XD-V1 +rtase: Refactor the rtase_check_mac_version_valid() function +sunrpc: clear XPRT_SOCK_UPD_TIMEOUT when reset transport +xfrm: Fix acquire state insertion. +xfrm: replace deprecated strncpy with strscpy_pad +xfrm: Add error handling when nla_put_u32() returns an error +xfrm: Convert struct xfrm_dst_lookup_params -> tos to dscp_t. +xfrm: Convert xfrm_dst_lookup() to dscp_t. +xfrm: Convert xfrm_bundle_create() to dscp_t. +xfrm: Convert xfrm_get_tos() to dscp_t. +xfrm: Restrict percpu SA attribute to specific netlink message types +xfrm: Add an inbound percpu state cache. +xfrm: Cache used outbound xfrm states at the policy. +xfrm: Add support for per cpu xfrm state handling. +net: txgbe: remove GPIO interrupt controller +batman-adv: Fix "Arguments in wrong order" issue +net: enetc: add UDP segmentation offload support +net: enetc: add LSO support for i.MX95 ENETC PF +net: enetc: update max chained Tx BD number for i.MX95 ENETC +net: enetc: add Tx checksum offload for i.MX95 ENETC +net: enetc: add Rx checksum offload for i.MX95 ENETC +Documentation: tipc: fix formatting issue in tipc.rst +selftests: nic_performance: Add selftest for performance of NIC driver +selftests: nic_link_layer: Add selftest case for speed and duplex states +selftests: nic_link_layer: Add link layer selftest for NIC driver +eth: fbnic: add RPC hardware statistics +eth: fbnic: add PCIe hardware statistics +eth: fbnic: add basic debugfs structure +eth: fbnic: add missing header guards +eth: fbnic: add missing SPDX headers +eth: fbnic: don't disable the PCI device twice +selftests: net: netlink-dumps: validation checks +net/neighbor: clear error in case strict check is not set netdev-genl: Hold rcu_read_lock in napi_set netdev-genl: Hold rcu_read_lock in napi_get net: phylink: improve phylink_sfp_config_phy() error message with empty supported @@ -71,8 +99,6 @@ net: wwan: t7xx: Change PM_AUTOSUSPEND_MS to 5000 net: ena: Add PHC documentation net: ena: PHC silent reset net: ena: Add PHC support in the ENA driver -net: stmmac: set initial EEE policy configuration -net: phy: set eee_cfg based on PHY configuration net: bridge: Fix the wrong format specifier enic: Move kdump check into enic_adjust_resources() enic: Move enic resource adjustments to separate function @@ -81,14 +107,9 @@ enic: Allocate arrays in enic struct based on VIC config enic: Save resource counts we read from HW enic: Make MSI-X I/O interrupts come after the other required ones enic: Create enic_wq/rq structures to bundle per wq/rq data -dt-bindings: net: sff,sfp: Fix "interrupts" property typo dt-bindings: net: renesas,ether: Drop undocumented "micrel,led-mode" -dt-bindings: net: mdio-mux-gpio: Drop undocumented "marvell,reg-init" dt-bindings: net: dsa: microchip,ksz: Drop undocumented "id" Add string check in netlink_ack_tlv_fill -i40e: Fix handling changed priv flags -vmxnet3: Remove adapter from DMA region -vmxnet3: Fix inconsistent DMA accesses in vmxnet3_probe_device() e1000: Hold RTNL when e1000_down can be called igbvf: remove unused spinlock igb: Fix 2 typos in comments in igb_main.c @@ -110,13 +131,6 @@ net/diag: Warn only once on EMSGSIZE net/diag: Do not race on dumping MD5 keys with adding new MD5 keys gve: Flow steering trigger reset only for timeout error rust: net::phy scope ThisModule usage in the module_phy_driver macro -net: ethtool: add ring parameter filtering -net: devmem: add ring parameter filtering -bnxt_en: add support for header-data-split-thresh ethtool command -net: ethtool: add support for configuring header-data-split-thresh -bnxt_en: add support for tcp-data-split ethtool command -net: ethtool: add tcp_data_split_mod member in kernel_ethtool_ringparam -bnxt_en: add support for rx-copybreak ethtool command libeth: add a couple of XDP helpers (libeth_xdp) libeth: support native XDP and register memory model xsk: add helper to get &xdp_desc's DMA and meta pointer in one go @@ -140,49 +154,6 @@ netconsole: selftest: Validate CPU number auto-population in userdata netconsole: docs: Add documentation for CPU number auto-population netconsole: Add option to auto-populate CPU number in userdata netconsole: Ensure dynamic_netconsole_mutex is held during userdata update -selftest: extend test_rss_context_queue_reconfigure for action addition -selftest: validate RSS+ntuple filters with nonzero ring_cookie -selftest: include dst-ip in ethtool ntuple rules -net: ethtool: account for RSS+RXNFC add semantics when checking channel count -net: ethtool: only allow set_rxnfc with rss + ring_cookie if driver opts in -net: sparx5: add missing lan969x Kconfig dependency -net: mv643xx_eth: disable IP tx checksum with jumbo frames for Armada 310 -net: enetc: clean up before returning in probe() net: stmmac: dwmac-qcom-ethqos: Enable support for XGMAC -octeon_ep: add ndo ops for VFs in PF driver -mdio: Remove mdio45_ethtool_gset_npage() -include: mdio: Remove mdio45_ethtool_gset() net/smc: Optimize the search method of reused buf_desc -virtio_net: xdp_features add NETDEV_XDP_ACT_XSK_ZEROCOPY -virtio_net: update tx timeout record -virtio_net: xsk: tx: support xmit xsk buffer -virtio_net: xsk: prevent disable tx napi -virtio_net: xsk: bind/unbind xsk for tx -virtio_net: refactor the xmit type -virtio_ring: remove API virtqueue_set_dma_premapped -virtio-net: rq submits premapped per-buffer -virtio_ring: introduce add api for premapped -virtio_ring: perform premapped operations based on per-buffer -virtio_ring: packed: record extras for indirect buffers -virtio_ring: split: record extras for indirect buffers -virtio_ring: introduce vring_need_unmap_buffer ipv6: Avoid invoking addrconf_verify_rtnl unnecessarily -bpf: lwtunnel: Prepare bpf_lwt_xmit_reroute() to future .flowi4_tos conversion. -bpf: ipv4: Prepare __bpf_redirect_neigh_v4() to future .flowi4_tos conversion. -Merge branch 'tools-net-ynl-rework-async-notification-handling' -tools/net/ynl: add async notification handling -Revert "tools/net/ynl: improve async notification handling" -Merge branch 'net-phy-switch-eee_broken_modes-to-linkmode-bitmap-and-add-accessor' -r8169: copy vendor driver 2.5G/5G EEE advertisement constraints -net: phy: add phy_set_eee_broken -net: phy: convert eee_broken_modes to a linkmode bitmap -Merge branch 'Fixes to bpf_msg_push/pop_data and test_sockmap' -bpf, sockmap: Fix sk_msg_reset_curr -bpf, sockmap: Several fixes to bpf_msg_pop_data -bpf, sockmap: Several fixes to bpf_msg_push_data -selftests/bpf: Add more tests for test_txmsg_push_pop in test_sockmap -selftests/bpf: Add push/pop checking for msg_verify_data in test_sockmap -selftests/bpf: Fix total_bytes in msg_loop_rx in test_sockmap -selftests/bpf: Fix SENDPAGE data logic in test_sockmap -selftests/bpf: Add txmsg_pass to pull/push/pop in test_sockmap -selftests/bpf: Drop netns helpers in mptcp