[SRU][N][PATCH 0/2] Missing prerequisite patches for noble upstream stable patchset 2025-12-08

[Manuel Diewald]

BugLink: https://bugs.launchpad.net/bugs/2134382

SRU Justification:

[Impact]

We backported b69d4413aa19 ("bpftool: Fix cgroup command to only show
cgroup bpf programs") from v6.12.35 to noble as part of upstream stable
patchset 2025-12-08 (LP: #2134382) but did not include the prerequisite
patch 98b303c9bf05 ("bpftool: Query only cgroup-related attach types")
and its follow-up fix 43745d11bfd9 ("bpftool: Fix regression of "bpftool
cgroup tree" EINVAL on older kernels"). This breaks the bpftool build:

cgroup.c: In function 'do_show':
cgroup.c:341:36: error: 'cgroup_attach_types' undeclared

cgroup.c: In function 'do_show_tree_fn':
cgroup.c:405:36: error: 'cgroup_attach_types' undeclared

[Fix]

Include the missing prerequisite patches in noble.

[Test Plan]

Build bpftool.

[Where problems could occur]

This fix limits the attach types that the bpftool-cgroup command is
querying. Potential issues would be observed when using any of the
cgroup-related commands of bpftool.

Kenta Tada (1):
  bpftool: Query only cgroup-related attach types

YiFei Zhu (1):
  bpftool: Fix regression of "bpftool cgroup tree" EINVAL on older
    kernels

 tools/bpf/bpftool/cgroup.c | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

-- 
2.34.1