Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-11-26--03-00 (v6.18-rc6-1481-g9cdf4a2d7e8b) remotes/brancher/net-next-2025-11-26--06-00 (v6.18-rc6-1489-g2d52c0d030de) ==== BASE DIFF ==== .../net_cachelines/inet_connection_sock.rst | 2 +- drivers/android/binder_netlink.c | 1 + drivers/android/binder_netlink.h | 1 + drivers/dpll/dpll_nl.c | 1 + drivers/dpll/dpll_nl.h | 1 + .../chelsio/inline_crypto/chtls/chtls_io.c | 8 +- drivers/net/ethernet/intel/ice/virt/queues.c | 3 + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 2 +- drivers/net/ethernet/realtek/r8169_main.c | 92 +++++++------ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 4 +- drivers/net/ovpn/netlink-gen.c | 1 + drivers/net/ovpn/netlink-gen.h | 1 + drivers/net/phy/mxl-gpy.c | 115 ++++++++++++++++- drivers/net/team/team_nl.c | 1 + drivers/net/team/team_nl.h | 1 + drivers/net/virtio_net.c | 44 ++++--- drivers/ptp/ptp_ocp.c | 46 +++---- fs/lockd/netlink.c | 1 + fs/lockd/netlink.h | 1 + fs/nfsd/netlink.c | 1 + fs/nfsd/netlink.h | 1 + include/net/inet_connection_sock.h | 20 +-- include/net/sock.h | 13 +- include/uapi/linux/android/binder_netlink.h | 1 + include/uapi/linux/dpll.h | 1 + include/uapi/linux/ethtool_netlink_generated.h | 1 + include/uapi/linux/fou.h | 1 + include/uapi/linux/handshake.h | 1 + include/uapi/linux/if_team.h | 1 + include/uapi/linux/lockd_netlink.h | 1 + include/uapi/linux/mptcp_pm.h | 1 + include/uapi/linux/net_shaper.h | 1 + include/uapi/linux/netdev.h | 1 + include/uapi/linux/nfsd_netlink.h | 1 + include/uapi/linux/ovpn.h | 1 + include/uapi/linux/psp.h | 1 + net/core/netdev-genl-gen.c | 1 + net/core/netdev-genl-gen.h | 1 + net/core/sock.c | 4 +- net/devlink/netlink_gen.c | 1 + net/devlink/netlink_gen.h | 1 + net/handshake/genl.c | 1 + net/handshake/genl.h | 1 + net/ipv4/fou_nl.c | 1 + net/ipv4/fou_nl.h | 1 + net/ipv4/inet_connection_sock.c | 12 +- net/ipv4/inet_diag.c | 8 +- net/ipv4/tcp_ipv4.c | 8 +- net/ipv4/tcp_timer.c | 23 ++-- net/ipv6/tcp_ipv6.c | 8 +- net/mptcp/mptcp_pm_gen.c | 1 + net/mptcp/mptcp_pm_gen.h | 1 + net/mptcp/protocol.c | 27 ++-- net/mptcp/protocol.h | 2 +- net/psp/psp-nl-gen.c | 1 + net/psp/psp-nl-gen.h | 1 + net/shaper/shaper_nl_gen.c | 1 + net/shaper/shaper_nl_gen.h | 1 + net/xdp/xsk.c | 143 +++++++++++++-------- tools/include/uapi/linux/netdev.h | 1 + tools/net/ynl/pyynl/ynl_gen_c.py | 26 ++-- tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 8 +- tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 8 +- tools/testing/selftests/net/.gitignore | 8 -- tools/testing/selftests/net/af_unix/.gitignore | 8 ++ tools/testing/selftests/net/af_unix/so_peek_off.c | 4 +- tools/testing/vsock/vsock_test.c | 7 +- 67 files changed, 450 insertions(+), 243 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.e7WpkV2EJ9 b/tmp/tmp.w2zIwxCp9v index ed3ff019566f..66ee9e95f263 100644 --- a/tmp/tmp.e7WpkV2EJ9 +++ b/tmp/tmp.w2zIwxCp9v @@ -11,7 +11,16 @@ nipa: local: add short sleep to bond_macvlan_ipvlan.sh nipa: config: x86: use periodic HZ tick nipa: disable 6.17's merge window kunit tests nipa: disable random kunit tests +selftests/net/ipsec: Fix variable size type not at the end of struct +netmem, devmem, tcp: access pp fields through @desc in net_iov +eth: bnxt: make use of napi_consume_skb() +net/sched: em_canid: add length check before reading CAN ID net: atlantic: fix fragment overflow handling in RX path +net: bonding: combine rtnl lock block for arp monitor in activebackup mode +net: bonding: add the READ_ONCE/WRITE_ONCE for outside lock accessing +net: bonding: skip the 2nd trylock when first one fail +net: bonding: move bond_should_notify_peers, e.g. into rtnl lock block +net: bonding: use workqueue to make sure peer notify updated in lacp mode MAINTAINERS: separate VIRTIO NET DRIVER and add netdev selftests/net: packetdrill: pass send_omit_free to MSG_ZEROCOPY tests iavf: clarify VLAN add/delete log messages and lower log level @@ -28,9 +37,6 @@ ice: add support for unmanaged DPLL on E830 NIC selftests/tc-testing: Check Cake Scheduler when enqueue drops packets net/sched: sch_cake: Fix incorrect qlen reduction in cake_drop virtio-net: avoid unnecessary checksum calculation on guest RX -io_uring: Introduce getsockname io_uring cmd -socket: Split out a getsockname helper for io_uring -socket: Unify getsockname and getpeername implementation eth: fbnic: Fix counter roll-over issue hsr: fix NULL pointer dereference in skb_clone with hw tag insertion net/mlx5: Document devlink rates @@ -84,9 +90,6 @@ ice: extract GRXRINGS from .get_rxnfc iavf: extract GRXRINGS from .get_rxnfc i40e: extract GRXRINGS from .get_rxnfc s390/net: list Aswin Karuvally as maintainer -xsk: remove spin lock protection of cached_prod -xsk: use atomic operations around cached_prod for copy mode -xsk: add atomic cached_prod for copy mode net: fec: do not register PPS event for PEROUT net: fec: do not allow enabling PPS and PEROUT simultaneously net: fec: do not update PEROUT if it is enabled @@ -97,9 +100,6 @@ net: Introduce netif_xmit_time_out_duration() helper net: wwan: mhi: Keep modem name match with Foxconn T99W640 net: mctp: unconditionally set skb->dev on dst output net: wwan: mhi_wwan_mbim: Avoid -Wflex-array-member-not-at-end warning -selftest: af_unix: Extend recv() timeout in so_peek_off.c. -selftest: af_unix: Create its own .gitignore. -drivers: net: fbnic: Return the true error in fbnic_alloc_napi_vectors. ptp: ptp_ines: add HW timestamp configuration reporting net: phy: nxp-c45-tja11xx: add HW timestamp configuration reporting phy: mscc: add HW timestamp configuration reporting @@ -107,11 +107,6 @@ net: phy: dp83640: add HW timestamp configuration reporting net: phy: broadcom: add HW timestamp configuration reporting phy: add hwtstamp_get callback to phy drivers phy: rename hwtstamp callback to hwtstamp_set -tcp: remove icsk->icsk_retransmit_timer -tcp: introduce icsk->icsk_keepalive_timer -net: move sk_dst_pending_confirm and sk_pacing_status to sock_read_tx group -tcp: rename icsk_timeout() to tcp_timeout_expires() -ice: fix broken Rx on VFs net: stmmac: pci: Use generic PCI suspend/resume routines net: stmmac: loongson: Use generic PCI suspend/resume routines net: stmmac: Add generic suspend/resume helper for PCI-based controllers @@ -132,12 +127,6 @@ quic: provide common utilities and data structures net: build socket infrastructure for QUIC protocol net: define IPPROTO_QUIC and SOL_QUIC constants amd-xgbe: schedule NAPI on Rx Buffer Unavailable to prevent RX stalls -chtls: Avoid -Wflex-array-member-not-at-end warning -ptp: ocp: Reuse META's PCI vendor ID -ptp: ocp: Apply standard pattern for cleaning up loop -ptp: ocp: Make ptp_ocp_unregister_ext() NULL-aware -ptp: ocp: Refactor signal_show() and fix %ptT misuse -r8169: improve MAC EEE handling selftests: bonding: add mux and churn state testing bonding: restructure ad_churn_machine bonding: set AD_RX_PORT_DISABLED when disabling a port @@ -147,11 +136,7 @@ eea: create/destroy rx,tx queues for netdevice open and stop eea: probe the netdevice and create adminq eea: introduce ring and descriptor structures eea: introduce PCI framework -vsock/test: Extend transport change null-ptr-deref test amd-xgbe: let the MAC manage PHY PM -r8169: fix RTL8127 hang on suspend/shutdown -net: phy: mxl-gpy: add support for MxL86252 and MxL86282 -net: phy: mxl-gpy: add support for MxL86211C Documentation: networking: Document the phy_port infrastructure net: phy: dp83822: Add SFP support through the phy_port interface net: phy: Only rely on phy_port for PHY-driven SFP @@ -188,8 +173,4 @@ netconsole: resume previously deactivated target netconsole: add STATE_DEACTIVATED to track targets disabled by low level netconsole: convert 'enabled' flag to enum for clearer state management netconsole: add target_state enum -net: sxgbe: fix potential NULL dereference in sxgbe_rx() net: mana: Handle hardware recovery events when probing the device -tools: ynl-gen: add regeneration comment -tools: ynl-gen: add function prefix argument -virtio_net: enhance wake/stop tx queue statistics accounting