Subject: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 10 Jan 2025 11:38:55 +1100

Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  net/sched/sch_cake.c

between commit:

  737d4d91d35b ("sched: sch_cake: add bounds checks to host bulk flow fairness counts")

from the net tree and commit:

  a42d71e322a8 ("net_sched: sch_cake: Add drop reasons")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/sched/sch_cake.c
index 2c2e2a67f3b2,deb0925f536d..000000000000
--- a/net/sched/sch_cake.c
+++ b/net/sched/sch_cake.c
@@@ -1972,6 -1935,8 +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;