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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 8 Jun 2023 10:31:26 +1000

Hi all,

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

  net/sched/sch_taprio.c

between commit:

  d636fc5dd692 ("net: sched: add rcu annotations around qdisc->qdisc_sleeping")

from the net tree and commit:

  dced11ef84fb ("net/sched: taprio: don't overwrite "sch" variable in taprio_dump_class_stats()")

from the net-next tree.

I fixed it up (I think - 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_taprio.c
index dd7dea2f6e83,3c4c2c334878..000000000000
--- a/net/sched/sch_taprio.c
+++ b/net/sched/sch_taprio.c
@@@ -2388,12 -2456,19 +2456,19 @@@ static int taprio_dump_class_stats(stru
  	__acquires(d->lock)
  {
  	struct netdev_queue *dev_queue = taprio_queue_get(sch, cl);
 -	struct Qdisc *child = dev_queue->qdisc_sleeping;
++	struct Qdisc *child = rtnl_dereference(dev_queue->qdisc_sleeping);
+ 	struct tc_taprio_qopt_offload offload = {
+ 		.cmd = TAPRIO_CMD_TC_STATS,
+ 		.tc_stats = {
+ 			.tc = cl - 1,
+ 		},
+ 	};
  
- 	sch = rtnl_dereference(dev_queue->qdisc_sleeping);
- 	if (gnet_stats_copy_basic(d, NULL, &sch->bstats, true) < 0 ||
- 	    qdisc_qstats_copy(d, sch) < 0)
+ 	if (gnet_stats_copy_basic(d, NULL, &child->bstats, true) < 0 ||
+ 	    qdisc_qstats_copy(d, child) < 0)
  		return -1;
- 	return 0;
+ 
+ 	return taprio_dump_xstats(sch, d, &offload, &offload.tc_stats.stats);
  }
  
  static void taprio_walk(struct Qdisc *sch, struct qdisc_walker *arg)