From: Jakub Kicinski <kuba@kernel.org>
Date: Fri, 10 Jan 2025 00:11:47 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Tag: block-6.14-20240131~28^2~106
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=14ea4cd1b19162888f629c4ce1ba268c683b0f12;p=linux-block.git

Merge git://git./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>
---

14ea4cd1b19162888f629c4ce1ba268c683b0f12
diff --cc net/sched/sch_cake.c
index deb0925f536d,2c2e2a67f3b2..48dd8c88903f
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@@ -1935,8 -1972,6 +1974,7 @@@ static struct sk_buff *cake_dequeue(str
  {
  	struct cake_sched_data *q = qdisc_priv(sch);
  	struct cake_tin_data *b = &q->tins[q->cur_tin];
- 	struct cake_host *srchost, *dsthost;
 +	enum skb_drop_reason reason;
  	ktime_t now = ktime_get();
  	struct cake_flow *flow;
  	struct list_head *head;