From: Martin KaFai Lau <martin.lau@kernel.org>
Date: Fri, 2 May 2025 21:50:09 +0000 (-0700)
Subject: Merge branch 'fix-bpf-qdisc-bugs-and-clean-up'
X-Git-Tag: v6.16-rc1~132^2~173^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=30190f82a1a9eb555703879cfe835627cff7a0e2;p=linux-block.git

Merge branch 'fix-bpf-qdisc-bugs-and-clean-up'

Amery Hung says:

====================
Fix bpf qdisc bugs and clean up

This patchset fixes the following bugs in bpf qdisc and clean up the
selftest.

- A null-pointer dereference can happen in qdisc_watchdog_cancel() if
  the timer is not initialized when 1) .init is not defined by user so
  init prologue is not generated. 2) .init fails and qdisc_create()
  calls .destroy

- bpf qdisc fails to attach to mq/mqprio when being set as the default
  qdisc due to failed qdisc_lookup() in init prologue

v2
- Rebase to bpf-next/net
- Fix erroneous commit messages
- Fix and simplify selftests cleanup
  v1: https://lore.kernel.org/bpf/20250501223025.569020-1-ameryhung@gmail.com/
====================

Link: https://patch.msgid.link/20250502201624.3663079-1-ameryhung@gmail.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
---

30190f82a1a9eb555703879cfe835627cff7a0e2