Similar to 5.4 case, but in this case, sch_ets.c commit was backported as a "Stable-dep-of" commit for another fix, but not the others.
So here's a cherry-pick of other requisite commits, including the fix commit for sch_htb.
There was only one conflict with sch_drr.c, which was the same as 5.4.
Thanks, Siddh
Cong Wang (6): sch_htb: make htb_qlen_notify() idempotent sch_drr: make drr_qlen_notify() idempotent sch_hfsc: make hfsc_qlen_notify() idempotent sch_qfq: make qfq_qlen_notify() idempotent codel: remove sch->q.qlen check before qdisc_tree_reduce_backlog() sch_htb: make htb_deactivate() idempotent
net/sched/sch_codel.c | 5 +---- net/sched/sch_drr.c | 7 ++++--- net/sched/sch_fq_codel.c | 6 ++---- net/sched/sch_hfsc.c | 8 ++++++-- net/sched/sch_htb.c | 13 ++++++------- net/sched/sch_qfq.c | 7 +++++-- 6 files changed, 24 insertions(+), 22 deletions(-)