Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-11-16--00-00 (v6.12-rc7-1785-gb12beaf0385e) remotes/brancher/net-next-2024-11-16--03-00 (v6.12-rc7-1785-g259e1d836aab) ==== BASE DIFF ==== .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 8 + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 1 - .../devicetree/bindings/net/mdio-mux-gpio.yaml | 32 -- Documentation/devicetree/bindings/net/sff,sfp.yaml | 2 +- drivers/bluetooth/btbcm.c | 4 +- drivers/bluetooth/btintel.c | 108 +++++- drivers/bluetooth/btintel.h | 10 + drivers/bluetooth/btintel_pcie.c | 387 ++++++++++++++++++--- drivers/bluetooth/btintel_pcie.h | 18 +- drivers/bluetooth/btmtk.c | 3 +- drivers/bluetooth/btmtksdio.c | 21 +- drivers/bluetooth/btmtkuart.c | 2 +- drivers/bluetooth/btnxpuart.c | 81 ++++- drivers/bluetooth/btrtl.c | 2 +- drivers/bluetooth/btusb.c | 76 +++- drivers/bluetooth/hci_bcm.c | 25 +- drivers/bluetooth/hci_ldisc.c | 2 +- drivers/bluetooth/hci_ll.c | 2 +- drivers/bluetooth/hci_nokia.c | 2 +- drivers/bluetooth/hci_qca.c | 32 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 32 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 11 + drivers/net/ethernet/cisco/enic/enic.h | 62 ++-- drivers/net/ethernet/cisco/enic/enic_ethtool.c | 8 +- drivers/net/ethernet/cisco/enic/enic_main.c | 386 +++++++++++--------- drivers/net/ethernet/cisco/enic/enic_res.c | 42 ++- drivers/net/ethernet/freescale/enetc/enetc_vf.c | 8 +- drivers/net/ethernet/google/gve/gve_adminq.c | 4 +- drivers/net/ethernet/intel/e1000/e1000_main.c | 10 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 2 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 3 +- drivers/net/ethernet/intel/ice/ice.h | 6 +- drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 17 + drivers/net/ethernet/intel/ice/ice_base.c | 3 +- drivers/net/ethernet/intel/ice/ice_ddp.c | 302 ++++++++-------- drivers/net/ethernet/intel/ice/ice_ddp.h | 5 +- drivers/net/ethernet/intel/ice/ice_ethtool.c | 110 +++--- drivers/net/ethernet/intel/ice/ice_ethtool.h | 39 ++- drivers/net/ethernet/intel/ice/ice_lib.c | 6 +- drivers/net/ethernet/intel/ice/ice_main.c | 41 ++- drivers/net/ethernet/intel/ice/ice_virtchnl.c | 59 ++-- drivers/net/ethernet/intel/igb/igb_main.c | 6 +- drivers/net/ethernet/intel/igbvf/igbvf.h | 3 - drivers/net/ethernet/intel/igbvf/netdev.c | 3 - drivers/net/ethernet/intel/igc/igc_diag.c | 3 +- drivers/net/ethernet/intel/igc/igc_ethtool.c | 13 +- drivers/net/ethernet/intel/igc/igc_hw.h | 1 - drivers/net/ethernet/intel/igc/igc_mac.c | 316 ++++++++--------- drivers/net/ethernet/intel/igc/igc_main.c | 1 - drivers/net/ethernet/intel/igc/igc_phy.c | 24 +- drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 +- drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 16 +- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 15 +- drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 1 + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 1 + drivers/net/ethernet/marvell/octeontx2/nic/rep.c | 2 +- drivers/net/ethernet/microchip/lan969x/Kconfig | 2 +- drivers/net/ethernet/microchip/lan969x/Makefile | 2 +- drivers/net/ethernet/mscc/ocelot_net.c | 4 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- drivers/net/ethernet/realtek/r8169_main.c | 6 + drivers/net/ethernet/realtek/r8169_phy_config.c | 16 +- drivers/net/ethernet/realtek/rtase/rtase.h | 2 +- drivers/net/ethernet/realtek/rtase/rtase_main.c | 10 +- drivers/net/ethernet/sfc/ef100_ethtool.c | 1 + drivers/net/ethernet/sfc/ethtool.c | 1 + drivers/net/macvlan.c | 4 +- drivers/net/mdio.c | 172 --------- drivers/net/phy/dp83869.c | 20 +- drivers/net/phy/micrel.c | 2 +- drivers/net/phy/microchip_t1.c | 1 + drivers/net/phy/phy-c45.c | 16 +- drivers/net/phy/phy-core.c | 21 +- drivers/net/phy/phy_device.c | 4 +- drivers/net/virtio_net.c | 369 ++++++++++++++++---- drivers/net/vxlan/vxlan_core.c | 10 +- drivers/virtio/virtio_ring.c | 356 +++++++++---------- include/linux/ethtool.h | 4 + include/linux/mdio.h | 19 - include/linux/netdevice.h | 14 +- include/linux/netpoll.h | 1 + include/linux/phy.h | 21 +- include/linux/virtio.h | 13 +- include/net/bluetooth/hci.h | 19 +- include/net/bluetooth/hci_core.h | 85 ++++- include/net/bluetooth/mgmt.h | 10 + include/net/netfilter/nf_tables.h | 25 +- include/uapi/linux/netfilter/nf_tables.h | 18 +- net/bluetooth/hci_conn.c | 230 ++++++++---- net/bluetooth/hci_core.c | 26 +- net/bluetooth/hci_event.c | 47 ++- net/bluetooth/hci_sync.c | 9 +- net/bluetooth/hci_sysfs.c | 15 +- net/bluetooth/iso.c | 121 +++++-- net/bluetooth/mgmt.c | 60 ++++ net/bluetooth/rfcomm/sock.c | 10 +- net/bluetooth/sco.c | 99 ++++-- net/bridge/br_fdb.c | 27 +- net/bridge/br_private.h | 4 +- net/core/filter.c | 90 +++-- net/core/lwt_bpf.c | 2 +- net/core/netdev-genl.c | 4 + net/core/netpoll.c | 45 ++- net/core/rtnetlink.c | 20 +- net/ethtool/common.c | 42 ++- net/ethtool/ioctl.c | 5 + net/ipv4/netfilter.c | 2 +- net/ipv4/netfilter/ipt_rpfilter.c | 2 +- net/ipv4/netfilter/nf_dup_ipv4.c | 2 +- net/ipv4/netfilter/nft_fib_ipv4.c | 3 +- net/netfilter/ipset/ip_set_bitmap_ip.c | 7 +- net/netfilter/nf_bpf_link.c | 2 +- net/netfilter/nf_tables_api.c | 385 ++++++++++++++++---- net/netfilter/nfnetlink.c | 2 +- net/netfilter/nft_bitwise.c | 166 +++++++-- net/netfilter/nft_flow_offload.c | 4 +- net/netlink/af_netlink.c | 4 +- net/xdp/xsk.c | 11 +- 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 ++++- .../selftests/drivers/net/mlxsw/devlink_trap.sh | 2 +- .../drivers/net/mlxsw/devlink_trap_l3_drops.sh | 4 +- .../net/mlxsw/devlink_trap_l3_exceptions.sh | 12 +- .../drivers/net/mlxsw/devlink_trap_tunnel_ipip.sh | 4 +- .../drivers/net/mlxsw/devlink_trap_tunnel_ipip6.sh | 4 +- .../drivers/net/mlxsw/devlink_trap_tunnel_vxlan.sh | 4 +- .../net/mlxsw/devlink_trap_tunnel_vxlan_ipv6.sh | 4 +- .../selftests/drivers/net/mlxsw/tc_sample.sh | 4 +- .../drivers/net/netdevsim/fib_notifications.sh | 6 +- tools/testing/selftests/net/Makefile | 2 +- tools/testing/selftests/net/drop_monitor_tests.sh | 2 +- tools/testing/selftests/net/fdb_notify.sh | 96 +++++ tools/testing/selftests/net/fib_tests.sh | 8 +- .../selftests/net/forwarding/devlink_lib.sh | 2 +- tools/testing/selftests/net/forwarding/lib.sh | 199 +---------- .../testing/selftests/net/forwarding/tc_police.sh | 8 +- tools/testing/selftests/net/lib.sh | 223 ++++++++++++ tools/testing/selftests/net/netfilter/.gitignore | 1 + .../selftests/net/netfilter/conntrack_dump_flush.c | 6 + 144 files changed, 3969 insertions(+), 2082 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.Eo8sPtIlJg b/tmp/tmp.H9XWPdoyDT index 158e74fc0d29..a5bb364d7ffb 100644 --- a/tmp/tmp.Eo8sPtIlJg +++ b/tmp/tmp.H9XWPdoyDT @@ -72,190 +72,22 @@ docs: tls: document TLS1.3 key updates tls: add counters for rekey tls: implement rekey for TLS1.3 tls: block decryption when a rekey is pending -net: dlink: add support for reporting stats via `ethtool -S` rocker: fix link status detection in rocker_carrier_init() -selftests: net: fdb_notify: Add a test for FDB notifications -selftests: net: lib: Add kill_process -selftests: net: lib: Move checks from forwarding/lib.sh here -selftests: net: lib: Move tests_run from forwarding/lib.sh here -selftests: net: lib: Move logging from forwarding/lib.sh here -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 -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 -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 -net: netpoll: Individualize the skb pool 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 -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 Add string check in netlink_ack_tlv_fill -e1000: Hold RTNL when e1000_down can be called -igbvf: remove unused spinlock -igb: Fix 2 typos in comments in igb_main.c -igc: remove autoneg parameter from igc_mac_info -ixgbe: Break include dependency cycle -ice: Unbind the workqueue -ice: use stack variable for virtchnl_supported_rxdids -ice: initialize pf->supported_rxdids immediately after loading DDP -ice: only allow Tx promiscuous for multicast -ice: Add support for persistent NAPI config -ice: support optional flags in signature segment header -ice: refactor "last" segment of DDP pkg -ice: extend dump serdes equalizer values feature -ice: rework of dump serdes equalizer values feature -net/netlink: Correct the comment on netlink message max cap -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 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 -xsk: add helper to get &xdp_desc's DMA and meta pointer in one go -xsk: add generic XSk &xdp_buff -> skb conversion -xsk: make xsk_buff_add_frag really add a frag via __xdp_buff_add_frag() -xsk: allow attaching XSk pool via xdp_rxq_info_reg_mem_model() -xsk: align &xdp_buff_xsk harder -xdp: add generic xdp_build_skb_from_buff() -xdp: add generic xdp_buff_add_frag() -xdp: get rid of xdp_frame::mem.id -page_pool: allow mixing PPs within one bulk -page_pool: make page_pool_put_page_bulk() actually handle array of pages -xdp: register system page pool as an XDP memory model -xdp: allow attaching already registered memory model to xdp_rxq_info -xdp, xsk: constify read-only arguments of some static inline helpers -bpf, xdp: constify some bpf_prog * function arguments -unroll: add generic loop unroll helpers -skbuff: allow 2-4-argument skb_frag_dma_map() -jump_label: export static_key_slow_{inc,dec}_cpuslocked() 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/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