Re: linux-next: build failure after merge of the net tree

From: David Miller
Date: Wed Feb 15 2017 - 22:28:21 EST


From: Alexei Starovoitov <ast@xxxxxx>
Date: Wed, 15 Feb 2017 19:06:02 -0800

> On 2/15/17 7:02 PM, Stephen Rothwell wrote:
>> Hi all,
>>
>> On Tue, 14 Feb 2017 09:12:50 +1100 Stephen Rothwell
>> <sfr@xxxxxxxxxxxxxxxx> wrote:
>>>
>>> After merging the net tree, today's linux-next build (powerpc64le
>>> perf)
>>> failed like this:
>>>
>>> Warning: tools/include/uapi/linux/bpf.h differs from kernel
>>> bpf.c: In function 'bpf_prog_attach':
>>> bpf.c:180:6: error: 'union bpf_attr' has no member named
>>> 'attach_flags'; did you mean 'map_flags'?
>>> attr.attach_flags = flags;
>>> ^
>>>
>>> Caused by commit
>>>
>>> 7f677633379b ("bpf: introduce BPF_F_ALLOW_OVERRIDE flag")
>>>
>>
>> So do we have a fix for this? I am sure that Dave would like to send
>> his "net" tree to Linus sometime soonish ...
>
> Do you mind resending it to netdev with my Ack ?
> please mention [PATCH net] in subj, so it's get caught by Dave's
> scripts.

I applied the fix that synced the two header files already.