diff mbox series

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

Message ID 20230608103126.24c01d43@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the net-next tree with the net tree |

Commit Message

Stephen Rothwell June 8, 2023, 12:31 a.m. UTC 
  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.
diff mbox series

Patch

diff --cc net/sched/sch_taprio.c
index dd7dea2f6e83,3c4c2c334878..000000000000
--- a/net/sched/sch_taprio.c