diff options
author | Paolo Abeni <pabeni@redhat.com> | 2025-10-01 10:10:50 +0200 |
---|---|---|
committer | Paolo Abeni <pabeni@redhat.com> | 2025-10-01 10:14:49 +0200 |
commit | f1455695d2d99894b65db233877acac9a0e120b9 (patch) | |
tree | d9c2853acb232bc6187073381ec745c36f961b46 /rust/helpers/bug.c | |
parent | 936f160a95cddd361d9c70798464e87a9cc57a37 (diff) | |
parent | daa26ea63c6f848159821cd9b3cbe47cddbb0a1c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.17-rc8).
Conflicts:
tools/testing/selftests/drivers/net/bonding/Makefile
87951b566446 selftests: bonding: add test for passive LACP mode
c2377f1763e9 selftests: bonding: add test for LACP actor port priority
Adjacent changes:
drivers/net/ethernet/cadence/macb.h
fca3dc859b20 net: macb: remove illusion about TBQPH/RBQPH being per-queue
89934dbf169e net: macb: Add TAPRIO traffic scheduling support
drivers/net/ethernet/cadence/macb_main.c
fca3dc859b20 net: macb: remove illusion about TBQPH/RBQPH being per-queue
89934dbf169e net: macb: Add TAPRIO traffic scheduling support
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'rust/helpers/bug.c')
0 files changed, 0 insertions, 0 deletions