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

Daniel Borkmann
2020-10-06T08:53:42Z

On 10/6/20 7:41 AM, Stephen Rothwell wrote:
> On Tue, 6 Oct 2020 07:13:01 +0200 Christoph Hellwig <hch@lst.de> wrote:
>>
>> On Tue, Oct 06, 2020 at 02:58:47PM +1100, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the net-next tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>
>> It actually doesn't need that or the two other internal headers.
>> Bjoern has a fixed, and it was supposed to be queued up according to
>> patchwork.
>
> Yeah, it is in the bpf-next tree but not merged into the net-next tree
> yet.

Yep, applied yesterday. Given a3cf77774abf ("dma-mapping: merge <linux/dma-noncoherent.h>
into <linux/dma-map-ops.h>") is in dma-mapping tree and not yet affecting bpf-next
nor net-next, we were planning to ship bpf-next at the usual cadence this week, so it'll
be in net-next end of week for sure. (If there is urgent reason to have it in net-next
today, please let us know of course.)

Thanks,
Daniel