Re: [PATCH 6.6 000/290] 6.6.95-rc1 review

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Tue, Jun 24, 2025 at 05:25:11PM +0530, Harshit Mogalapalli wrote:
> Hi Greg,
> 
> > > Build issue:
> > > 
> > > In file included from main.h:14,
> > >                   from cgroup.c:20:
> > > cgroup.c: In function 'do_show':
> > > cgroup.c:339:36: error: 'cgroup_attach_types' undeclared (first use in this
> > > function); did you mean 'parse_attach_type'?
> > >    339 |         for (i = 0; i < ARRAY_SIZE(cgroup_attach_types); i++) {
> > >        |                                    ^~~~~~~~~~~~~~~~~~~
> > > 
> > > 
> > > 
> > > BPF tool build is failing:
> > > 
> > > 
> > > Culprit looks like:
> > > 
> > > commit: 27db5e6b493b ("bpftool: Fix cgroup command to only show cgroup bpf
> > > programs")
> > > 
> > 
> > Odd that 6.1.y isn't failing as well.  I'll go drop this from all
> > branches older than 6.15.y for now.
> > 
> 
> I did test 6.12.y and 6.6.y but not 6.1.y.
> 
> So didn't report 6.1.y - but the issue is there as well.
> 
> Let us not drop it from 6.12.y greg. Why ?
> 
> The problem is because this commit was missing in 6.6.y causing the build to
> fail. but this commit: 98b303c9bf05 ("bpftool: Query only cgroup-related
> attach types") is present in 6.12.y. So lets us not drop backport of commit:
> b69d4413aa19 ("bpftool: Fix cgroup command to only show cgroup bpf
> programs") from 6.12.y
> 
> 
> 
>   mainline        : v6.11-rc1 - 98b303c9bf05 bpftool: Query only
> cgroup-related attach types
>   ├── stable-6.11 : v6.11-rc1 - 98b303c9bf05
>   ├── stable-6.12 : v6.11-rc1 - 98b303c9bf05
>   ├── stable-6.13 : v6.11-rc1 - 98b303c9bf05
>   ├── stable-6.14 : v6.11-rc1 - 98b303c9bf05
>   ├── stable-6.15 : v6.11-rc1 - 98b303c9bf05
> 
> 
> Summary: Drop the patch we are talking about: upstream  commit: b69d4413aa19
> ("bpftool: Fix cgroup command to only show cgroup bpf programs") from 6.1.y
> and 6.6.y but not from 6.12.y

Ok, I just assumed that this was also broken on 6.12.y, so dropped it
there.  I've now added it back, thanks for letting me know.

greg k-h