Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-04-16--03-00 (v6.15-rc1-573-g07084b5f232f) remotes/brancher/net-next-2025-04-16--06-00 (v6.15-rc1-576-g299d69c587b7) ==== BASE DIFF ==== drivers/net/can/rockchip/rockchip_canfd-core.c | 7 ++-- drivers/net/dsa/mv88e6xxx/ptp.c | 11 ++--- drivers/net/dsa/sja1105/sja1105_ptp.c | 14 ++----- drivers/net/ethernet/intel/ice/ice_ptp.c | 16 +++----- drivers/net/ethernet/intel/igb/igb_ptp.c | 20 +++------ drivers/net/ethernet/intel/igc/igc_ptp.c | 14 ++----- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 26 ++++-------- drivers/net/ethernet/microchip/lan743x_ptp.c | 14 ++----- .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 14 ++----- drivers/net/ethernet/mscc/ocelot_ptp.c | 5 --- drivers/net/ethernet/mscc/ocelot_vsc7514.c | 2 + drivers/net/ethernet/renesas/ravb_ptp.c | 11 +---- drivers/net/phy/dp83640.c | 13 ++---- drivers/net/phy/micrel.c | 17 +++----- drivers/net/phy/microchip_rds_ptp.c | 5 +-- drivers/net/phy/nxp-c45-tja11xx.c | 13 ++---- drivers/ptp/ptp_chardev.c | 16 +++++++- drivers/ptp/ptp_clockmatrix.c | 14 +------ drivers/ptp/ptp_fc3.c | 1 + drivers/ptp/ptp_idt82p33.c | 15 ++----- include/linux/ptp_clock_kernel.h | 18 ++++++++ include/net/fib_rules.h | 2 + include/net/flow.h | 1 + include/net/l3mdev.h | 27 ++++++++++++ net/batman-adv/hard-interface.c | 1 - net/can/j1939/socket.c | 1 + net/core/fib_rules.c | 48 ++++++++++++++++++---- net/l3mdev/l3mdev.c | 4 +- tools/testing/selftests/net/fib_rule_tests.sh | 34 +++++++++++++++ 29 files changed, 203 insertions(+), 181 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.vAZDLEkYZu b/tmp/tmp.l5pmntxzpL index 39ebe4e3e403..f542cfb00e5c 100644 --- a/tmp/tmp.vAZDLEkYZu +++ b/tmp/tmp.l5pmntxzpL @@ -15,10 +15,12 @@ pds_core: make wait_context part of q_info pds_core: Remove unnecessary check in pds_client_adminq_cmd() pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result pds_core: Prevent possible adminq overflow/stuck condition -net: lwtunnel: disable BHs when required net: don't try to ops lock uninitialized devs -net/mlx5: Fix memory leak in error path of ttc creation -net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table() +sched: Add enqueue/dequeue of dualpi2 qdisc +sched: Dump configuration and statistics of dualpi2 qdisc +sched: Struct definition and parsing of dualpi2 qdisc +selftests/tc-testing: Add selftests for qdisc DualPI2 +Documentation: netlink: specs: tc: Add DualPI2 specification vxlan: Convert FDB table to rhashtable vxlan: Introduce FDB key structure vxlan: Do not treat dst cache initialization errors as fatal @@ -39,21 +41,37 @@ net: pktgen: fix code style (WARNING: please, no space before tabs) net: pktgen: fix code style (ERROR: else should follow close brace '}') net: ipv6: ioam6: fix double reallocation net: ipv6: ioam6: use consistent dst names +testing/selftests: add test tool and scripts for ovpn module +ovpn: add basic ethtool support +ovpn: notify userspace when a peer is deleted +ovpn: kill key and notify userspace in case of IV exhaustion +ovpn: implement key add/get/del/swap via netlink +ovpn: implement peer add/get/dump/delete via netlink +ovpn: add support for updating local or remote UDP endpoint +ovpn: implement keepalive mechanism +ovpn: implement peer lookup logic +ovpn: implement multi-peer support +ovpn: add support for MSG_NOSIGNAL in tcp_sendmsg +skb: implement skb_send_sock_locked_with_flags() +ovpn: implement TCP transport +ovpn: store tunnel and transport statistics +ovpn: implement packet processing +ovpn: implement basic RX path (UDP) +ovpn: implement basic TX path (UDP) +ovpn: introduce the ovpn_socket object +ovpn: introduce the ovpn_peer object +ovpn: keep carrier always on for MP interfaces +ovpn: add basic interface creation/destruction/management routines +ovpn: add basic netlink support +net: introduce OpenVPN Data Channel Offload (ovpn) net: phy: mediatek: init val in .phy_led_polarity_set for AN7581 -can: rockchip_canfd: fix broken quirks checks -can: fix missing decrement of j1939_proto.inuse_idx net: stmmac: sun8i: use stmmac_pltfr_probe() net: stmmac: intel: remove unnecessary setting max_speed -r8169: do not call rtl8169_down() twice on shutdown -net: devmem: fix kernel panic when socket close after module unload net: ti: icss-iep: Fix possible NULL pointer dereference for perout request net: ti: icssg-prueth: Fix possible NULL pointer dereference inside emac_xmit_xdp_frame() net: ti: icssg-prueth: Fix kernel warning while bringing down network interface net: ethtool: phy: Convert the PHY_GET command to generic phy dump net: ethtool: Introduce per-PHY DUMP operations -selftests: net: add a virtio_net deadlock selftest -selftests: net: move xdp_helper to net/lib -virtio-net: disable delayed refill when pausing rx net: airoha: Add missing filed to ppe_mbox_data struct net: airoha: Add matchall filter offload support ptp: ocp: fix start time alignment in ptp_ocp_signal_set @@ -65,8 +83,6 @@ net: dsa: free routing table on probe failure net: dsa: clean up FDB, MDB, VLAN entries on unbind net: dsa: mv88e6xxx: fix -ENOENT when deleting VLANs and MST is unsupported net: dsa: mv88e6xxx: avoid unregistering devlink regions which were never registered -net: ptp: introduce .supported_perout_flags to ptp_clock_info -net: ptp: introduce .supported_extts_flags to ptp_clock_info net: b53: enable BPDU reception for management port net: bridge: switchdev: do not notify new brentries as changed xen-netfront: handle NULL returned by xdp_convert_buff_to_frame() @@ -84,9 +100,6 @@ ipv6: Check GATEWAY in rtm_to_fib6_multipath_config(). ipv6: Move some validation from ip6_route_info_create() to rtm_to_fib6_config(). ipv6: Get rid of RTNL for SIOCDELRT and RTM_DELROUTE. ipv6: Validate RTA_GATEWAY of RTA_MULTIPATH in rtm_to_fib6_config(). -batman-adv: Fix double-hold of meshif when getting enabled -selftests: fib_rule_tests: Add VRF match tests -net: fib_rules: Fix iif / oif matching on L3 master device cxgb4: fix memory leak in cxgb4_init_ethtool_filters() error path rds: Use nested-BH locking for rds_page_remainder rds: Acquire per-CPU pointer within BH disabled section @@ -106,7 +119,6 @@ ipv6: sr: Use nested-BH locking for hmac_storage ipv4/route: Use this_cpu_inc() for stats on PREEMPT_RT net: dst_cache: Use nested-BH locking for dst_cache::cache net: page_pool: Don't recycle into cache on PREEMPT_RT -nfc: replace improper check device_is_registered() in nfc_se_io() tcp: try to avoid safer when ACKs are thinned tcp: accecn: try to fit AccECN option with SACK tcp: accecn: AccECN ACE field multi-wrap heuristic @@ -127,23 +139,4 @@ net: txgbe: Support to set UDP tunnel port net: ethernet: ti: am65-cpsw: handle -EPROBE_DEFER net: ethernet: ti: am65-cpsw: set fwnode for ports rtase: Add ndo_setup_tc support for CBS offload in traffic control setup -net: ch9200: avoid triggering NWay restart on non-zero PHY ID -net: ch9200: add missing error handling in ch9200_bind() -net: ch9200: fail fast on control_read() failures during get_mac_address() -net: ch9200: remove extraneous return that prevents error propagation -net: ch9200: fix uninitialised access bug during mii_nway_restart -net: enetc: add loopback support for i.MX95 ENETC PF -net: enetc: add VLAN filtering support for i.MX95 ENETC PF -net: enetc: move generic VLAN hash filter functions to enetc_pf_common.c -net: enetc: extract enetc_refresh_vlan_ht_filter() -net: enetc: enable RSS feature by default -net: enetc: change enetc_set_rss() to void type -net: enetc: add RSS support for i.MX95 ENETC PF -net: enetc: make enetc_set_rss_key() reusable -net: enetc: add set/get_rss_table() hooks to enetc_si_ops -net: enetc: add debugfs interface to dump MAC filter -net: enetc: add MAC filtering for i.MX95 ENETC PF -net: enetc: move generic MAC filtering interfaces to enetc-core -net: enetc: add command BD ring support for i.MX95 ENETC -net: enetc: add initial netc-lib driver to support NTMP tcp: tcp_acceptable_seq select SND.UNA when SND.WND is 0