Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-15--21-00 (v6.12-rc7-1740-g11cb4911519e) remotes/brancher/net-next-2024-11-16--00-00 (v6.12-rc7-1785-gb12beaf0385e) ==== 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, 408 insertions(+), 450 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.7uWzmTq91F b/tmp/tmp.naRDGiqRGs index 1406b488546f..158e74fc0d29 100644 --- a/tmp/tmp.7uWzmTq91F +++ b/tmp/tmp.naRDGiqRGs @@ -3,13 +3,19 @@ fs/9p: use kvzalloc/kvfree to allocate struct p9_rdir and its buffer tc_action dbg profile patch forwarding: set timeout to 3 hours +UAPI: ethtool: Avoid flex-array in struct ethtool_link_settings +Revert "UAPI: ethtool: Use __struct_group() in struct ethtool_link_settings" +Revert "net: ethtool: Avoid thousands of -Wflex-array-member-not-at-end warnings" +net: fsl_pq_mdio: return directly in probe +net: fsl_pq_mdio: use devm for of_iomap +net: fsl_pq_mdio: use platform_get_resource +net: fsl_pq_mdio: use devm for mdiobus_alloc_size +net: fsl_pq_mdio: use dev variable in _probe selftests: net: add more info to error in bpf_offload MAINTAINERS: exclude can core, drivers and DT bindings from netdev ML -net: uevent: also pass network device driver net/smc: Run patches also by RDMA ML mptcp: pm: avoid code duplication to lookup endp mptcp: pm: lockless list traversal to dump endp -net: stmmac: dwmac-tegra: Read iommu stream id from device tree bnxt_en: Add FW trace coredump segments to the coredump bnxt_en: Add a new ethtool -W dump flag bnxt_en: Add 2 parameters to bnxt_fill_coredump_seg_hdr() @@ -21,33 +27,16 @@ bnxt_en: Add a 'force' parameter to bnxt_free_ctx_mem() bnxt_en: Refactor bnxt_free_ctx_mem() bnxt_en: Add mem_valid bit to struct bnxt_ctx_mem_type bnxt_en: Update firmware interface spec to 1.10.3.85 -ixgbe: Correct BASE-BX10 compliance code -netfilter: bitwise: add support for doing AND, OR and XOR directly -netfilter: bitwise: rename some boolean operation functions -netfilter: nf_dup4: Convert nf_dup_ipv4_route() to dscp_t. -netfilter: nft_fib: Convert nft_fib4_eval() to dscp_t. -netfilter: rpfilter: Convert rpfilter_mt() to dscp_t. -netfilter: flow_offload: Convert nft_flow_route() to dscp_t. -netfilter: ipv4: Convert ip_route_me_harder() to dscp_t. -netfilter: nf_tables: allocate element update information dynamically -netfilter: nf_tables: switch trans_elem to real flex array -netfilter: nf_tables: prepare nft audit for set element compaction -netfilter: nf_tables: prepare for multiple elements in nft_trans_elem structure -netfilter: nf_tables: add nft_trans_commit_list_add_elem helper -netfilter: bpf: Pass string literal as format argument of request_module() -netfilter: nfnetlink: Report extack policy errors for batched ops 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 -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 @@ -77,9 +66,6 @@ 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 selftests: tls: add rekey tests selftests: tls: add key_generation argument to tls_crypto_info_init docs: tls: document TLS1.3 key updates @@ -97,15 +83,11 @@ ndo_fdb_del: Add a parameter to report whether notification was sent ndo_fdb_add: Add a parameter to report whether notification was sent net: ethernet: ti: am65-cpsw: enable DSCP to priority map for RX net: ethernet: ti: am65-cpsw: update pri_thread_map as per IEEE802.1Q-2014 -netfilter: ipset: add missing range check in bitmap_ip_uadt -selftests: netfilter: Fix missing return values in conntrack_dump_flush -selftests: netfilter: Add missing gitignore file net: phy: microchip_t1 : Add initialization of ptp for lan887x net: phy: Makefile: Add makefile support for ptp in Microchip phys net: phy: Kconfig: Add ptp library support and 1588 optional flag in Microchip phys net: phy: microchip_ptp : Add ptp library for Microchip phys net: phy: microchip_ptp : Add header file for Microchip ptp library -bnxt_en: optimize gettimex64 rtase: Modify the content format of the enum rtase_registers rtase: Modify the name of the goto label net: netpoll: flush skb pool during cleanup @@ -114,22 +96,11 @@ ipv6/udp: Add 4-tuple hash for connected socket ipv4/udp: Add 4-tuple hash for connected socket net/udp: Add 4-tuple hash list basis net/udp: Add a new struct for hash2 slot -net: phy: microchip_t1: Clause-45 PHY loopback support for LAN887x octeontx2-pf: Fix spelling mistake "reprentator" -> "representor" 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: bridge: Fix the wrong format specifier -enic: Move kdump check into enic_adjust_resources() -enic: Move enic resource adjustments to separate function -enic: Adjust used MSI-X wq/rq/cq/interrupt resources in a more robust way -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: renesas,ether: Drop undocumented "micrel,led-mode" -dt-bindings: net: dsa: microchip,ksz: Drop undocumented "id" Add string check in netlink_ack_tlv_fill e1000: Hold RTNL when e1000_down can be called igbvf: remove unused spinlock @@ -150,7 +121,6 @@ net/diag: Always pre-allocate tcp_ulp info net/diag: Pre-allocate optional info only if requested 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 libeth: add a couple of XDP helpers (libeth_xdp) libeth: support native XDP and register memory model @@ -175,6 +145,117 @@ 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 -net: stmmac: dwmac-qcom-ethqos: Enable support for XGMAC net/smc: Optimize the search method of reused buf_desc ipv6: Avoid invoking addrconf_verify_rtnl unnecessarily +Merge branch 'enic-use-all-the-resources-configured-on-vic' +enic: Move kdump check into enic_adjust_resources() +enic: Move enic resource adjustments to separate function +enic: Adjust used MSI-X wq/rq/cq/interrupt resources in a more robust way +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 +net: phy: microchip_t1: Clause-45 PHY loopback support for LAN887x +dt-bindings: net: dsa: microchip,ksz: Drop undocumented "id" +bnxt_en: optimize gettimex64 +netdev-genl: Hold rcu_read_lock in napi_set +Merge tag 'for-net-next-2024-11-14' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next +Merge tag 'nf-next-24-11-15' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next +netfilter: bitwise: add support for doing AND, OR and XOR directly +netfilter: bitwise: rename some boolean operation functions +netfilter: nf_dup4: Convert nf_dup_ipv4_route() to dscp_t. +netfilter: nft_fib: Convert nft_fib4_eval() to dscp_t. +netfilter: rpfilter: Convert rpfilter_mt() to dscp_t. +netfilter: flow_offload: Convert nft_flow_route() to dscp_t. +netfilter: ipv4: Convert ip_route_me_harder() to dscp_t. +Merge branch 'net-make-rss-rxnfc-semantics-more-explicit' +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 +dt-bindings: net: sff,sfp: Fix "interrupts" property typo +dt-bindings: net: mdio-mux-gpio: Drop undocumented "marvell,reg-init" +net: sparx5: add missing lan969x Kconfig dependency +net: enetc: clean up before returning in probe() +mdio: Remove mdio45_ethtool_gset_npage() +include: mdio: Remove mdio45_ethtool_gset() +Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next +Merge branch 'ipv4-prepare-bpf-helpers-to-flowi4_tos-conversion' +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 +Bluetooth: MGMT: Add initial implementation of MGMT_OP_HCI_CMD_SYNC +Bluetooth: fix use-after-free in device_for_each_child() +Bluetooth: btintel: Direct exception event to bluetooth stack +Bluetooth: hci_core: Fix calling mgmt_device_connected +Bluetooth: hci_bcm: Use the devm_clk_get_optional() helper +Bluetooth: ISO: Send BIG Create Sync via hci_sync +Bluetooth: hci_conn: Remove alloc from critical section +Bluetooth: ISO: Use kref to track lifetime of iso_conn +Bluetooth: SCO: Use kref to track lifetime of sco_conn +Bluetooth: HCI: Add IPC(11) bus type +Bluetooth: btusb: Add 3 HWIDs for MT7925 +Bluetooth: btusb: Add new VID/PID 0489/e124 for MT7925 +Bluetooth: ISO: Update hci_conn_hash_lookup_big for Broadcast slave +Bluetooth: ISO: Do not emit LE BIG Create Sync if previous is pending +Bluetooth: ISO: Fix matching parent socket for BIS slave +Bluetooth: ISO: Do not emit LE PA Create Sync if previous is pending +Bluetooth: btrtl: Decrease HCI_OP_RESET timeout from 10 s to 2 s +Bluetooth: btbcm: fix missing of_node_put() in btbcm_get_board_name() +Bluetooth: btusb: Add new VID/PID 0489/e111 for MT7925 +Bluetooth: btmtk: adjust the position to init iso data anchor +Bluetooth: btintel_pcie: Replace deprecated PCI functions +Bluetooth: Set quirks for ATS2851 +Bluetooth: Support new quirks for ATS2851 +Bluetooth: Add new quirks for ATS2851 +Bluetooth: btintel_pcie: remove redundant assignment to variable ret +Bluetooth: Fix type of len in rfcomm_sock_getsockopt{,_old}() +Bluetooth: btintel: Do no pass vendor events to stack +Bluetooth: btintel_pcie: Remove deadcode +Bluetooth: hci_qca: use devm_clk_get_optional_enabled_with_rate() +Bluetooth: btintel: Add DSBR support for BlazarIW, BlazarU and GaP +Bluetooth: btmtksdio: Lookup device node only as fallback +Bluetooth: btintel_pcie: Add recovery mechanism +Bluetooth: btintel_pcie: Add handshake between driver and firmware +Bluetooth: hci_core: Fix not checking skb length on hci_scodata_packet +Bluetooth: hci_core: Fix not checking skb length on hci_acldata_packet +Bluetooth: btnxpuart: Add GPIO support to power save feature +dt-bindings: net: bluetooth: nxp: Add support for power save feature using GPIO +Bluetooth: hci_conn: Use disable_delayed_work_sync +Bluetooth: btusb: Add USB HW IDs for MT7920/MT7925 +Bluetooth: btusb: Add RTL8852BE device 0489:e123 to device tables +bluetooth: Fix typos in the comments +Bluetooth: hci_conn: Reduce hci_conn_drop() calls in two functions +Bluetooth: btnxpuart: Rename IW615 to IW610 +Bluetooth: btnxpuart: Drop _v0 suffix from FW names +Bluetooth: btusb: Add one more ID 0x13d3:0x3623 for Qualcomm WCN785x +Bluetooth: btusb: Add one more ID 0x0489:0xe0f3 for Qualcomm WCN785x +Bluetooth: btusb: add Foxconn 0xe0fc for Qualcomm WCN785x +Bluetooth: btusb: mediatek: change the conditions for ISO interface +Bluetooth: btusb: mediatek: add intf release flow when usb disconnect +Bluetooth: btusb: mediatek: add callback function in btusb_disconnect +Bluetooth: btusb: mediatek: move Bluetooth power off command position +netfilter: nf_tables: allocate element update information dynamically +netfilter: nf_tables: switch trans_elem to real flex array +netfilter: nf_tables: prepare nft audit for set element compaction +netfilter: nf_tables: prepare for multiple elements in nft_trans_elem structure +netfilter: nf_tables: add nft_trans_commit_list_add_elem helper +netfilter: bpf: Pass string literal as format argument of request_module() +netfilter: nfnetlink: Report extack policy errors for batched ops +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