1
0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-18 20:40:22 +00:00
Jakub Kicinski 14ea4cd1b1 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 <kuba@kernel.org>
2025-01-09 16:11:47 -08:00
..
2024-07-12 16:39:53 -07:00
2024-07-30 09:30:11 -10:00
2024-05-21 15:29:01 -07:00
2024-11-18 16:50:08 -08:00
2024-05-22 11:53:02 -07:00
2024-10-14 16:33:24 -05:00
2024-11-27 10:20:50 -08:00
2024-07-04 23:43:10 -07:00
2024-06-10 11:14:52 +01:00
2024-11-30 22:41:35 -05:00
2024-12-09 13:48:29 -08:00