| Message ID | 1480145027-3524392-1-git-send-email-ast@fb.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Acked-by: Rami Rosen <roszenrami@gmail.com> On 26 November 2016 at 09:23, Alexei Starovoitov <ast@fb.com> wrote: > this #include is unnecessary and brings whole set of > other headers into cgroup-defs.h. Remove it. > > Fixes: 3007098494be ("cgroup: add support for eBPF programs") > Signed-off-by: Alexei Starovoitov <ast@kernel.org> > --- > include/linux/bpf-cgroup.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h > index ec80d0c0953e..0cf1adfadd2d 100644 > --- a/include/linux/bpf-cgroup.h > +++ b/include/linux/bpf-cgroup.h > @@ -1,7 +1,6 @@ > #ifndef _BPF_CGROUP_H > #define _BPF_CGROUP_H > > -#include <linux/bpf.h> > #include <linux/jump_label.h> > #include <uapi/linux/bpf.h> > > -- > 2.8.0 >
On 11/26/2016 08:23 AM, Alexei Starovoitov wrote: > this #include is unnecessary and brings whole set of > other headers into cgroup-defs.h. Remove it. > > Fixes: 3007098494be ("cgroup: add support for eBPF programs") > Signed-off-by: Alexei Starovoitov <ast@kernel.org> This fixes many build errors in samples/bpf/ due to wrong helper redefinitions (originating from kernel includes conflicting with samples' helper declarations). I don't see it pushed out to net-next yet, so: Acked-by: Daniel Borkmann <daniel@iogearbox.net>
On 11/29/2016 11:48 AM, Daniel Borkmann wrote: > On 11/26/2016 08:23 AM, Alexei Starovoitov wrote: >> this #include is unnecessary and brings whole set of >> other headers into cgroup-defs.h. Remove it. >> >> Fixes: 3007098494be ("cgroup: add support for eBPF programs") >> Signed-off-by: Alexei Starovoitov <ast@kernel.org> > > This fixes many build errors in samples/bpf/ due to wrong helper > redefinitions (originating from kernel includes conflicting with > samples' helper declarations). > > I don't see it pushed out to net-next yet, so: > > Acked-by: Daniel Borkmann <daniel@iogearbox.net> > FWIW: Acked-by: Daniel Mack <daniel@zonque.org>
On Tue, Nov 29, 2016 at 2:48 AM, Daniel Borkmann <daniel@iogearbox.net> wrote: > On 11/26/2016 08:23 AM, Alexei Starovoitov wrote: >> >> this #include is unnecessary and brings whole set of >> other headers into cgroup-defs.h. Remove it. >> >> Fixes: 3007098494be ("cgroup: add support for eBPF programs") >> Signed-off-by: Alexei Starovoitov <ast@kernel.org> > > > This fixes many build errors in samples/bpf/ due to wrong helper > redefinitions (originating from kernel includes conflicting with > samples' helper declarations). > > I don't see it pushed out to net-next yet, so: > > Acked-by: Daniel Borkmann <daniel@iogearbox.net> Dave, this patch is marked as 'accepted', but I don't see in net-next ... please double check. Thanks!
diff --git a/include/linux/bpf-cgroup.h b/include/linux/bpf-cgroup.h index ec80d0c0953e..0cf1adfadd2d 100644 --- a/include/linux/bpf-cgroup.h +++ b/include/linux/bpf-cgroup.h @@ -1,7 +1,6 @@ #ifndef _BPF_CGROUP_H #define _BPF_CGROUP_H -#include <linux/bpf.h> #include <linux/jump_label.h> #include <uapi/linux/bpf.h>
this #include is unnecessary and brings whole set of other headers into cgroup-defs.h. Remove it. Fixes: 3007098494be ("cgroup: add support for eBPF programs") Signed-off-by: Alexei Starovoitov <ast@kernel.org> --- include/linux/bpf-cgroup.h | 1 - 1 file changed, 1 deletion(-)