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

David Miller
2018-08-03T02:44:26Z

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 3 Aug 2018 12:14:30 +1000

> Hi all,
>
> After merging the net-next tree, today's linux-next build (perf) failed
> like this:
>
> In file included from btf.c:10:0:
...
> Caused by commit
>
> 89b1698c93a9 ("Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net")
>
> Some of the lines in tools/lib/bpf/btf.[ch] were duplicated (they existed
> on both sides of the merge).
>
> I have used the net-next tree from next-20180802 for today.

My bad, I am working on fixing this now.

Thanks.