Single branch specified, using that and the previous one: remotes/brancher/net-next-2025-05-15--09-00 (v6.15-rc5-1256-g7edacedf4997) remotes/brancher/net-next-2025-05-15--12-00 (v6.15-rc5-1259-g7e34912d38b2) ==== BASE DIFF ==== .../device_drivers/ethernet/meta/fbnic.rst | 11 + drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 17 +- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu_trace.c | 1 + .../net/ethernet/marvell/octeontx2/af/rvu_trace.h | 62 ++++- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 5 +- .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 1 + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 3 +- .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 21 +- .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- drivers/net/ethernet/meta/Kconfig | 1 + drivers/net/ethernet/meta/fbnic/fbnic.h | 3 +- drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 260 +++++++++++++++++- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 294 +++++++++++++++++++-- drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 53 +++- drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 2 +- drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 9 + drivers/net/phy/marvell-88q2xxx.c | 103 ++++---- include/linux/netdevice.h | 2 +- lib/pldmfw/pldmfw.c | 6 + 21 files changed, 769 insertions(+), 91 deletions(-) ==== COMMIT DIFF ==== diff --git a/tmp/tmp.tetbfdqRy5 b/tmp/tmp.SPx1Ym71LC index 66d7af15040b..2abd0f9e73c8 100644 --- a/tmp/tmp.tetbfdqRy5 +++ b/tmp/tmp.SPx1Ym71LC @@ -6,13 +6,19 @@ selftests: net: enable profiling tc_action dbg profile patch forwarding: set timeout to 3 hours +net: rfs: add sock_rps_delete_flow() helper +r8169: add support for RTL8127A +bridge: netfilter: Fix forwarding of fragmented packets +net: selftests: add PHY loopback tests with HW checksum offload +net: selftests: add checksum mode support and SW checksum handling +net: selftests: prepare for detailed error handling in net_test_get_skb() +net: selftests: drop test index from net_selftest_get_strings() net: phy: microchip: document where the LAN88xx PHYs are used net: phy: make mdio consumer / device layer a separate module net: dlink: add synchronization for stats update net: dsa: microchip: linearize skb for tail-tagging switches net: airoha: Fix page recycling in airoha_qdma_rx_process() net: wwan: t7xx: Fix napi rx poll issue -r8169: add support for RTL8127A net: phy: realtek: add RTL8127-internal PHY team: grab team lock during team_change_rx_flags tsnep: fix timestamping with a stacked DSA driver @@ -80,18 +86,6 @@ tcp: add receive queue awareness in tcp_rcv_space_adjust() tcp: adjust rcvbuf in presence of reorders tcp: fix sk_rcvbuf overshoot tcp: add tcp_rcvbuf_grow() tracepoint -octeontx2: Add new tracepoint otx2_msg_status -octeontx2: Add pcifunc also to mailbox tracepoints -octeontx2-af: Display names for CPT and UP messages -octeontx2-af: convert dev_dbg to tracepoint in mbox -net: Look for bonding slaves in the bond's network namespace -eth: fbnic: Add devlink dev flash support -eth: fbnic: Add mailbox support for PLDM updates -eth: fbnic: Add support for multiple concurrent completion messages -eth: fbnic: Accept minimum anti-rollback version from firmware -pldmfw: Don't require send_package_data or send_component_table to be defined -octeontx2-pf: Do not reallocate all ntuple filters -net: phy: marvell-88q2xxx: Enable temperature measurement in probe again rds: Use nested-BH locking for rds_page_remainder rds: Acquire per-CPU pointer within BH disabled section rds: Disable only bottom halves in rds_page_remainder_alloc() @@ -108,8 +102,3 @@ 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 net: phy: mediatek: do not require syscon compatible for pio property -Documentation: netlink: specs: tc: Add DualPI2 specification -selftests/tc-testing: Add selftests for qdisc DualPI2 -sched: Add enqueue/dequeue of dualpi2 qdisc -sched: Dump configuration and statistics of dualpi2 qdisc -sched: Struct definition and parsing of dualpi2 qdisc