Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-22--09-00 (v6.15-rc6-1473-g3e885cae7ed6) remotes/brancher/net-next-2025-05-22--12-00 (v6.15-rc6-1509-g2bd85c094128) ==== BASE DIFF ==== drivers/net/can/kvaser_pciefd.c | 182 ++++++++++++--------- drivers/net/can/slcan/slcan-core.c | 26 ++- .../net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 24 ++- .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 11 +- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 9 +- include/net/xfrm.h | 1 - net/ipv4/esp4.c | 53 +----- net/ipv4/xfrm4_input.c | 18 +- net/ipv6/esp6.c | 53 +----- net/ipv6/xfrm6_input.c | 18 +- net/sched/sch_hfsc.c | 6 +- net/tipc/crypto.c | 5 + net/xfrm/espintcp.c | 4 +- net/xfrm/xfrm_ipcomp.c | 3 +- net/xfrm/xfrm_policy.c | 3 + net/xfrm/xfrm_state.c | 6 +- .../tc-testing/tc-tests/infra/qdiscs.json | 27 +++ 17 files changed, 234 insertions(+), 215 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.vlwDCAEjTX b/tmp/tmp.SNtzjkv3wk index f2eb8cdd9280..4732af6f5408 100644 --- a/tmp/tmp.vlwDCAEjTX +++ b/tmp/tmp.SNtzjkv3wk @@ -6,10 +6,42 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours -can: slcan: allow reception of short error messages -can: kvaser_pciefd: Continue parsing DMA buf after dropped RX -can: kvaser_pciefd: Fix echo_skb race -can: kvaser_pciefd: Force IRQ edge in case of nested IRQ +net: phy: fix up const issues in to_mdio_device() and to_phy_device() +octeontx2-pf: QOS: Perform cache sync on send queue teardown +netfilter: nf_conntrack: table full detailed log +net: bonding: add tracepoint for 802.3ad +net: bonding: send peer notify when failure recovery +net: bonding: add broadcast_neighbor netlink option +net: bonding: add broadcast_neighbor option for 802.3ad +selftests: can: test_raw_filter.sh: add support of physical interfaces +selftests: can: Import tst-filter from can-tests +can: dev: add struct data_bittiming_params to group FD parameters +can: rcar_canfd: Add RZ/G3E support +can: rcar_canfd: Enhance multi_channel_irqs handling +can: rcar_canfd: Add external_clk variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add sh variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add struct rcanfd_regs variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add shared_can_regs variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add ch_interface_mode variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add {nom,data}_bittiming variables to struct rcar_canfd_hw_info +can: rcar_canfd: Add max_cftml variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add max_aflpn variable to struct rcar_canfd_hw_info +can: rcar_canfd: Add rnc_field_width variable to struct rcar_canfd_hw_info +can: rcar_canfd: Update RCANFD_GAFLCFG macro +can: rcar_canfd: Add rcar_canfd_setrnc() +can: rcar_canfd: Drop the mask operation in RCANFD_GAFLCFG_SETRNC macro +can: rcar_canfd: Update RCANFD_GERFL_ERR macro +can: rcar_canfd: Drop RCANFD_GAFLCFG_GETRNC macro +can: rcar_canfd: Use of_get_available_child_by_name() +dt-bindings: can: renesas,rcar-canfd: Document RZ/G3E support +dt-bindings: can: renesas,rcar-canfd: Simplify the conditional schema +ARM: mxs_defconfig: Enable CONFIG_FEC_MTIP_L2SW to support MTIP L2 switch +ARM: mxs_defconfig: Update mxs_defconfig to 6.15-rc1 +ARM: mxs_defconfig: Enable CONFIG_NFS_FSCACHE +net: mtip: The L2 switch driver for imx287 +ARM: dts: nxp: mxs: Adjust XEA board's DTS to support L2 switch +ARM: dts: nxp: mxs: Adjust the imx28.dtsi L2 switch description +dt-bindings: net: Add MTIP L2 switch description ixgbe: Fix typos and clarify comments in X550 driver code Doc: networking: Fix various typos in rds.rst net/mlx5e: Allow setting MAC address of representors @@ -73,13 +105,6 @@ net: txgbe: Implement PHYLINK for AML 25G/10G devices net: txgbe: Distinguish between 40G and 25G devices net: wangxun: Use specific flag bit to simplify the code net: txgbe: Remove specified SP type -octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG -octeontx2-af: Set LMT_ENA bit for APR table entries -xfrm: Sanitize marks before insert -xfrm: ipcomp: fix truesize computation on receive -xfrm: Fix UDP GRO handling for some corner cases -espintcp: remove encap socket caching to avoid reference leak -espintcp: fix skb leaks net: neigh: use kfree_skb_reason() in neigh_resolve_output() and neigh_connected_output() net: dsa: microchip: Add SGMII port support to KSZ9477 switch libeth: xdp, xsk: access adjacent u32s as u64 where applicable @@ -101,12 +126,10 @@ libeth: convert to netmem selftests: ncdevmem: add tx test with multiple IOVs selftests: ncdevmem: make chunking optional net: devmem: support single IOV with sendmsg -net: enetc: fix NTMP build dependency ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use() net: ethernet: mtk_eth_soc: Correct spelling net: dlink: Correct endian treatment of t_SROM data net: usb: aqc111: fix error handling of usbnet read calls -net/tipc: fix slab-use-after-free Read in tipc_aead_encrypt_done eth: bnxt: fix deadlock when xdp is attached or detached octeontx2-af: NPC: Clear Unicast rule on nixlf detach selftest: af_unix: Test SO_PASSRIGHTS. @@ -120,13 +143,6 @@ af_unix: Don't pass struct socket to maybe_add_creds(). af_unix: Factorise test_bit() for SOCK_PASSCRED and SOCK_PASSPIDFD. net: mana: Add support for Multi Vports on Bare metal net: Add support for providing the PTP hardware source in tsinfo -net: bonding: add tracepoint for 802.3ad -net: bonding: send peer notify when failure recovery -net: bonding: add broadcast_neighbor netlink option -net: bonding: add broadcast_neighbor option for 802.3ad -octeontx2-pf: Avoid adding dcbnl_ops for LBK and SDP vf -selftests/tc-testing: Add an HFSC qlen accounting test -sch_hfsc: Fix qlen accounting bug when using peek in hfsc_enqueue() socket: Clean up kdoc for sock_create() and sock_create_lite(). socket: Replace most sock_create() calls with sock_create_kern(). socket: Remove kernel socket conversion except for net/rds/.