Single branch specified, using that and the previous one: remotes/brancher/net-next-2024-09-03--21-00 (v6.11-rc5-1011-g6fbc85a7fffa) remotes/brancher/net-next-2024-09-04--00-00 (v6.11-rc5-980-g2c971dc50a06) ==== BASE DIFF ==== Documentation/netlink/specs/nftables.yaml | 254 ++++++++++++++- drivers/net/can/dev/dev.c | 3 - drivers/net/can/peak_canfd/peak_canfd.c | 3 - drivers/net/can/usb/peak_usb/pcan_usb_core.c | 3 - drivers/net/ethernet/alacritech/slicoss.c | 13 +- drivers/net/ethernet/engleder/tsnep_ethtool.c | 4 - .../net/ethernet/freescale/enetc/enetc_ethtool.c | 10 +- drivers/net/ethernet/freescale/fec_main.c | 4 - drivers/net/ethernet/freescale/gianfar_ethtool.c | 10 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_ptp.c | 4 - drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 - .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 2 - .../net/ethernet/pensando/ionic/ionic_ethtool.c | 2 - drivers/net/ethernet/renesas/ravb_main.c | 4 +- drivers/net/ethernet/renesas/rswitch.c | 2 - drivers/net/ethernet/renesas/rtsn.c | 2 - net/ethtool/common.c | 15 +- net/mptcp/mib.c | 4 + net/mptcp/mib.h | 4 + net/mptcp/pm.c | 11 - net/mptcp/pm_netlink.c | 78 ++--- net/mptcp/pm_userspace.c | 40 +-- net/mptcp/protocol.h | 16 +- net/mptcp/subflow.c | 50 ++- tools/testing/selftests/net/mptcp/mptcp_join.sh | 350 +++++++++++++-------- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 10 +- 26 files changed, 581 insertions(+), 319 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.gqCsgKSxjI b/tmp/tmp.KEJx3LLjYo index a9b23b4e9843..6a476fd8c842 100644 --- a/tmp/tmp.gqCsgKSxjI +++ b/tmp/tmp.KEJx3LLjYo @@ -25,8 +25,6 @@ net: xilinx: axienet: Fix IRQ coalescing packet count overflow net: xilinx: axienet: Fix packet counting net: phy: Check for read errors in SIOCGMIIREG sched: sch_cake: fix bulk flow accounting logic for host fairness -selftests: rtnetlink: add 'ethtool' as a dependency -mptcp: pm: Fix uaf in __timer_delete_sync pds_core: Remove redundant null pointer checks ionic: Remove redundant null pointer checks in ionic_debugfs_add_qcq() net: sched: use RCU read-side critical section in taprio_dump() @@ -41,7 +39,6 @@ net: netconsole: rename body to msg_body net: netconsole: separate fragmented message handling in send_ext_msg net: netconsole: split send_ext_msg_udp() function net: netconsole: remove msg_ready variable -net: can: cc770: Simplify parsing DT properties ipv6: sit: Unmask upper DSCP bits in ipip6_tunnel_bind_dev() ip6_tunnel: Unmask upper DSCP bits in ip4ip6_err() ipv4: ipmr: Unmask upper DSCP bits in ipmr_queue_xmit() @@ -54,8 +51,6 @@ octeontx2-pf: Defines common API for HW resources configuration ice: Cleanup unused declarations igb: Cleanup unused declarations iavf: Remove unused declarations -ice: Fix improper handling of refcount in ice_sriov_set_msix_vec_count() -ice: Fix improper handling of refcount in ice_dpll_init_rclk_pins() l2tp: remove unneeded null check in l2tp_v2_session_get_next selftests/net: do_setcpu function not need to have a return value net: bridge: br_fdb_external_learn_add(): always set EXT_LEARN @@ -67,11 +62,9 @@ net: smc91x: Make use of irq_get_trigger_type() net: dsa: realtek: rtl8366rb: Make use of irq_get_trigger_type() net: dsa: realtek: rtl8365mb: Make use of irq_get_trigger_type() drm/i2c: tda998x: Make use of irq_get_trigger_type() -netlink: specs: nftables: allow decode of default firewalld ruleset fou: Fix null-ptr-deref in GRO. eth: fbnic: Add support to fetch group stats eth: fbnic: Add ethtool support for fbnic -net: alacritech: Partially revert "net: alacritech: Switch to use dev_err_probe()" selftests: add selftest for UDP SO_PEEK_OFF support net: sparx5: ditch sparx5_fdma_rx/tx_reload() functions net: sparx5: use contiguous memory for tx buffers @@ -92,63 +85,9 @@ selftests: mptcp: reset the last TS before the first test sefltests: mptcp: connect: remote time in TAP output selftests: mptcp: lib: add time per subtests in TAP output netlink: Use the BITS_PER_LONG macro -selftests: mptcp: pm_nl_ctl: remove re-definition -selftests: mptcp: join: simplify checksum_tests -selftests: mptcp: join: mute errors when ran in the background -selftests: mptcp: join: specify host being checked -selftests: mptcp: join: more explicit check name -selftests: mptcp: join: validate MPJ SYN TX MIB counters -selftests: mptcp: join: one line for join check -selftests: mptcp: join: reduce join_nr params -mptcp: MIB counters for sent MP_JOIN -mptcp: pm: reduce entries iterations on connect -mptcp: pm: rename helpers linked to 'flush' net: mana: Improve mana_set_channels() in low mem conditions -net: mvpp2: Remove setting of RX software timestamp -octeontx2-pf: Remove setting of RX software timestamp -gianfar: Remove setting of RX software timestamp -net: enetc: Remove setting of RX software timestamp -net: fec: Remove setting of RX software timestamp -net: hns3: Remove setting of RX software timestamp -net: ethernet: rtsn: Remove setting of RX software timestamp -net: renesas: rswitch: Remove setting of RX software timestamp -ravb: Remove setting of RX software timestamp -ionic: Remove setting of RX software timestamp -tsnep: Remove setting of RX software timestamp -can: peak_usb: Remove setting of RX software timestamp -can: peak_canfd: Remove setting of RX software timestamp -can: dev: Remove setting of RX software timestamp -ethtool: RX software timestamp for all net: phy: Add driver for Motorcomm yt8821 2.5G ethernet phy net: phy: Optimize phy speed mask to be compatible to yt8821 -wifi: wilc1000: Convert using devm_clk_get_optional_enabled() in wilc_bus_probe() -wifi: wilc1000: Convert using devm_clk_get_optional_enabled() in wilc_sdio_probe() -net: xilinx: axienet: Convert using devm_clk_get_optional_enabled() in axienet_probe() -net: ethernet: sunplus: Convert using devm_clk_get_enabled() in spl2sw_probe() -net: stmmac: dwmac-dwc-qos-eth: Convert using devm_clk_get_enabled() in dwc_qos_probe() -net: lantiq_xrx200: Convert using devm_clk_get_enabled() in xrx200_probe() -net: ethernet: hisilicon: Convert using devm_clk_get_enabled() in hisi_femac_drv_probe() -net: ftgmac100: Convert using devm_clk_get_enabled() in ftgmac100_setup_clk() -net: ethernet: ethoc: Convert using devm_clk_get_enabled() in ethoc_probe() -net: ethernet: arc: Convert using devm_clk_get_enabled() in emac_probe() -net: ethernet: Convert using devm_clk_get_enabled() in emac_probe() -net: dsa: bcm_sf2: Convert using devm_clk_get_optional_enabled() in bcm_sf2_sw_probe() net: stmmac: Batch set RX OWN flag and other flags -netdev: add dmabuf introspection -selftests: add ncdevmem, netcat for devmem TCP -net: add devmem TCP documentation -net: add SO_DEVMEM_DONTNEED setsockopt to release RX frags -tcp: RX path for devmem TCP -net: add support for skbs with unreadable frags -net: support non paged skb frags -memory-provider: dmabuf devmem memory provider -page_pool: devmem support -netdev: netdevice devmem allocator -netdev: support binding dma-buf to netdevice -net: netdev netlink api to bind dma-buf to a net device -netdev: add netdev_rx_queue_restart() -tools/net/ynl: fix cli.py --subscribe feature docs: netdev: document guidance on cleanup.h -rxtimestamp.c: add the test for SOF_TIMESTAMPING_OPT_RX_SOFTWARE_FILTER -net-timestamp: filter out report when setting SOF_TIMESTAMPING_SOFTWARE bareudp: Fix device stats updates.