Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-01-20--18-02 (v6.13-rc7-1653-g933cfe98beb2) remotes/brancher/net-next-2025-01-20--21-00 (v6.13-rc7-1651-g0af8ccf1b904) ==== BASE DIFF ==== drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 - drivers/net/mii.c | 3 + drivers/net/netdevsim/ethtool.c | 6 +- drivers/net/netdevsim/netdev.c | 10 +- include/linux/ethtool.h | 4 - include/linux/netdevice.h | 9 ++ include/net/dropreason-core.h | 28 +++- include/net/netdev_queues.h | 10 ++ include/net/netfilter/nf_conntrack.h | 18 +-- include/net/netfilter/nf_flow_table.h | 1 + include/net/netfilter/nf_tables.h | 10 +- net/bridge/br_netfilter_hooks.c | 30 +--- net/core/dev.c | 12 +- net/core/devmem.c | 4 +- net/dccp/sysctl.c | 4 - net/ethtool/netlink.c | 30 +++- net/ethtool/rings.c | 16 +- net/llc/sysctl_net_llc.c | 4 - net/netfilter/nf_conntrack_amanda.c | 2 +- net/netfilter/nf_conntrack_broadcast.c | 2 +- net/netfilter/nf_conntrack_core.c | 13 +- net/netfilter/nf_conntrack_h323_main.c | 4 +- net/netfilter/nf_conntrack_sip.c | 4 +- net/netfilter/nf_flow_table_core.c | 187 +++++++++++++++++++--- net/netfilter/nf_flow_table_ip.c | 14 +- net/netfilter/nf_tables_api.c | 123 +++++++------- net/netfilter/nft_chain_filter.c | 48 ++---- net/netfilter/nft_ct.c | 2 +- net/netfilter/nft_flow_offload.c | 16 +- net/netfilter/nft_set_rbtree.c | 43 +++++ net/unix/af_unix.c | 67 ++++---- net/unix/garbage.c | 2 +- tools/testing/selftests/net/ipsec.c | 3 +- 35 files changed, 476 insertions(+), 279 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.zK079KCGc2 b/tmp/tmp.oVH2o1LmKq index 91ed4b655933..273e1963ea36 100644 --- a/tmp/tmp.zK079KCGc2 +++ b/tmp/tmp.oVH2o1LmKq @@ -3,9 +3,7 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours -net: usb: qmi_wwan: Add error handling for usbnet_get_ethernet_addr net: airoha: Fix wrong GDM4 register definition -net: phy: Fix suspicious rcu_dereference usage net: phy: dp83822: Add support for changing the transmit amplitude voltage net: phy: Add helper for getting tx amplitude gain dt-bindings: net: ethernet-phy: add property tx-amplitude-100base-tx-gain-milli @@ -13,53 +11,16 @@ net/ncsi: use dev_set_mac_address() for Get MC MAC Address handling ipv4: ip_gre: Fix set but not used warning in ipgre_err() if IPv4-only net: phylink: fix regression when binding a PHY net: fec: implement TSO descriptor cleanup -netfilter: flowtable: add CLOSING state -netfilter: flowtable: teardown flow if cached mtu is stale -netfilter: conntrack: rework offload nf_conn timeout extension logic -netfilter: conntrack: remove skb argument from nf_ct_refresh -netfilter: nft_flow_offload: update tcp state flags under lock -netfilter: nft_flow_offload: clear tcp MAXACK flag before moving to slowpath -netfilter: nf_tables: Simplify chain netdev notifier -netfilter: nf_tables: Tolerate chains with no remaining hooks -netfilter: nf_tables: Compare netdev hooks based on stored name -netfilter: nf_tables: Use stored ifname in netdev hook dumps -netfilter: nf_tables: Store user-defined hook ifname -netfilter: nf_tables: Flowtable hook's pf value never varies -netfilter: br_netfilter: remove unused conditional and dead code -netfilter: nf_tables: fix set size with rbtree backend -sysctl net: Remove macro checks for CONFIG_SYSCTL -eth: bnxt: update header sizing defaults -eth: bnxt: allocate enough buffer space to meet HDS threshold -net: ethtool: populate the default HDS params in the core -eth: bnxt: apply hds_thrs settings correctly -net: provide pending ring configuration in net_device -net: ethtool: store netdev in a temp variable in ethnl_default_set_doit() -net: move HDS config from ethtool state net: phy: marvell-88q2xxx: Fix temperature measurement with reset-gpios net: hns3: fix oops when unload drivers paralleling net: ethernet: ti: am65-cpsw: streamline TX queue creation and cleanup net: ethernet: ti: am65-cpsw: streamline RX queue creation and cleanup net: ethernet: ti: am65-cpsw: ensure proper channel cleanup in error path -net-sysfs: remove rtnl_trylock from queue attributes -net-sysfs: prevent uncleared queues from being re-added -net-sysfs: move queue attribute groups outside the default groups -net-sysfs: remove rtnl_trylock from device attributes -net: mii: Fix the Speed display when the network cable is not connected NFC: nci: Add bounds checking in nci_hci_create_pipe() selftests/net: Add selftest for IPv4 RTM_GETMULTICAST support netlink: support dumping IPv4 multicast addresses -net: stmmac: Drop redundant skb_mark_for_recycle() for SKB frags net/ncsi: wait for the last response to Deselect Package before configuring channel net: phy: c45-tjaxx: add delay between MDIO write and read in soft_reset -af_unix: Use consume_skb() in connect() and sendmsg(). -af_unix: Reuse out_pipe label in unix_stream_sendmsg(). -af_unix: Set drop reason in unix_dgram_disconnected(). -af_unix: Set drop reason in unix_stream_read_skb(). -af_unix: Set drop reason in manage_oob(). -af_unix: Set drop reason in __unix_gc(). -af_unix: Set drop reason in unix_sock_destructor(). -af_unix: Set drop reason in unix_release_sock(). -net: dropreason: Gather SOCKET_ drop reasons. seg6: inherit inner IPv4 TTL on ip4ip6 encapsulation net: homa: create Makefile and Kconfig net: homa: create homa_plumbing.c and homa_utils.c