Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-12-18--12-00 (net-next-6.19-2689-gfe7c57650b36) remotes/brancher/net-next-2025-12-18--15-00 (net-next-6.19-2693-g2f625cd7e549) ==== BASE DIFF ==== CREDITS | 1 + MAINTAINERS | 1 - drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 5 ++ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 97 +++++++++++++++++++--- .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 8 +- drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 ++ drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 48 +++++++++-- drivers/net/ethernet/mellanox/mlx5/core/fw_reset.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 + include/net/netfilter/nf_tables.h | 34 ++++++-- net/netfilter/nf_nat_core.c | 14 +--- net/netfilter/nf_tables_api.c | 84 +++++++++++++++---- .../net/netfilter/conntrack_reverse_clash.c | 13 ++- .../net/netfilter/conntrack_reverse_clash.sh | 2 + .../packetdrill/conntrack_syn_challenge_ack.pkt | 2 +- 18 files changed, 259 insertions(+), 67 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.KlAJdJOXOZ b/tmp/tmp.EpNlijrIDr index 4216889b410f..0ee7654ccfdd 100644 --- a/tmp/tmp.KlAJdJOXOZ +++ b/tmp/tmp.EpNlijrIDr @@ -11,6 +11,13 @@ nipa: config: x86: use periodic HZ tick nipa: profile (time) test output nipa: config: disable CPU_MITIGATIONS nipa: disable random kunit tests +net: mana: Fix use-after-free in reset service rescan path +can: fix build dependency +can: j1939: make j1939_sk_bind() fail if device is no longer registered +can: j1939: make j1939_session_activate() fail if device is no longer registered +selftests: net: fib-onlink-tests: Set high metric for default IPv6 route +ice: drop udp_tunnel_get_rx_info() call from ndo_open() +i40e: drop udp_tunnel_get_rx_info() call from i40e_open() tcp: clarify tcp_congestion_ops functions comments net: avoid prefetching NULL pointers net: bridge: Describe @tunnel_hash member in net_bridge_vlan_group struct @@ -28,8 +35,6 @@ idpf: fix LAN memory regions command on some NVMs iavf: fix off-by-one issues in iavf_config_rss_reg() i40e: validate ring_len parameter against hardware-specific values i40e: fix scheduling in set_rx_mode -ice: drop udp_tunnel_get_rx_info() call from ndo_open() -i40e: drop udp_tunnel_get_rx_info() call from i40e_open() net/smc: Initialize smc hashtables before registering users Bluetooth: hci_sync: Add LE Channel Sounding HCI Command/event structures bng_en: update module description @@ -39,12 +44,6 @@ net: fix segmentation of forwarding fraglist GRO nfc: llcp: avoid double release/put on LLCP_CLOSED in nfc_llcp_recv_disc() nfc: llcp: stop processing on LLCP_CLOSED in nfc_llcp_recv_hdlc() net: wangxun: move PHYLINK dependency -selftests: netfilter: packetdrill: avoid failure on HZ=100 kernel -netfilter: nf_tables: avoid softlockup warnings in nft_chain_validate -netfilter: nf_tables: avoid chain re-validation if possible -netfilter: nf_tables: remove redundant chain validation on register store -netfilter: nf_nat: remove bogus direction check -MAINTAINERS: Remove Jozsef Kadlecsik from MAINTAINERS file net: usb: pegasus: fix memory leak on usb_submit_urb() failure vdpa: fix caching attributes of MMIO regions by setting them explicitly selftests: net: fix "buffer overflow detected" for tap.c @@ -56,7 +55,6 @@ selftests: drv-net: psp: fix test names in ipver_test_builder() selftests: drv-net: psp: fix templated test names in psp_ip_ver_test_builder() net: dsa: mxl-gsw1xx: Support R(G)MII slew rate configuration dt-bindings: net: dsa: lantiq,gswip: add MaxLinear R(G)MII slew rate -net: mana: Fix use-after-free in reset service rescan path net: docs: fix grammar in CAIF stack description netdev: increment TSO only if TSO is not enabled on any slave device mdio: Make use of bus callbacks @@ -96,17 +94,6 @@ net: nfc: nci: Fix parameter validation for packet data sctp: Clear inet_opt in sctp_v6_copy_ip_options(). sctp: Fetch inet6_sk() after setting ->pinet6 in sctp_clone_sock(). net/handshake: duplicate handshake cancellations leak socket -net/mlx5e: Don't include PSP in the hard MTU calculations -net/mlx5e: Do not update BQL of old txqs during channel reconfiguration -net/mlx5e: Trigger neighbor resolution for unresolved destinations -net/mlx5e: Use ip6_dst_lookup instead of ipv6_dst_lookup_flow for MAC init -net/mlx5: Serialize firmware reset with devlink -net/mlx5: fw_tracer, Handle escaped percent properly -net/mlx5: fw_tracer, Validate format string parameters -net/mlx5: Drain firmware reset in shutdown callback -net/mlx5: fw reset, clear reset requested on drain_fw_reset -ipv6: fix a BUG in rt6_get_pcpu_route() under PREEMPT_RT -net: macb: Relocate mog_init_rings() callback from macb_mac_link_up() to macb_open() wifi: iwlwifi: Implement settime64 as stub for MVM/MLD PTP wifi: iwlwifi: Fix firmware version handling wifi: mac80211: ocb: skip rx_no_sta when interface is not joined