diff options
| author | Jakub Kicinski <[email protected]> | 2025-01-10 00:11:47 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2025-01-10 00:11:47 +0000 |
| commit | 14ea4cd1b19162888f629c4ce1ba268c683b0f12 (patch) | |
| tree | 8b1c111ec9daa8eebbf6262acadbe96423895ed1 /drivers/net/netconsole.c | |
| parent | Merge branch 'tools-ynl-add-install-target' (diff) | |
| parent | Merge tag 'net-6.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | kernel-14ea4cd1b19162888f629c4ce1ba268c683b0f12.tar.gz kernel-14ea4cd1b19162888f629c4ce1ba268c683b0f12.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.13-rc7).
Conflicts:
a42d71e322a8 ("net_sched: sch_cake: Add drop reasons")
737d4d91d35b ("sched: sch_cake: add bounds checks to host bulk flow fairness counts")
Adjacent changes:
drivers/net/ethernet/meta/fbnic/fbnic.h
3a856ab34726 ("eth: fbnic: add IRQ reuse support")
95978931d55f ("eth: fbnic: Revert "eth: fbnic: Add hardware monitoring support via HWMON interface"")
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/netconsole.c')
0 files changed, 0 insertions, 0 deletions