Hi all,
After merging the net-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:
net/xdp/xsk_buff_pool.c:7:10: fatal error: linux/dma-noncoherent.h: No such file or directory
7 | #include <linux/dma-noncoherent.h>
| ^~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
1c1efc2af158 ("xsk: Create and free buffer pool independently from umem")
interacting with commit
a3cf77774abf ("dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>")
from the dma-mapping tree.
I have applied teh following merge fix patch.
From: Stephen Rothwell <[email protected]>
Date: Tue, 6 Oct 2020 14:53:30 +1100
Subject: [PATCH] xsk: fix up for "dma-mapping: merge <linux/dma-noncoherent.h>
into <linux/dma-map-ops.h>"
Signed-off-by: Stephen Rothwell <[email protected]>
---
net/xdp/xsk_buff_pool.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
index e63fadd000db..dbed16648607 100644
--- a/net/xdp/xsk_buff_pool.c
+++ b/net/xdp/xsk_buff_pool.c
@@ -4,7 +4,7 @@
#include <net/xdp_sock.h>
#include <net/xdp_sock_drv.h>
#include <linux/dma-direct.h>
-#include <linux/dma-noncoherent.h>
+#include <linux/dma-map-ops.h>
#include <linux/swiotlb.h>
#include "xsk_queue.h"
--
2.28.0
--
Cheers,
Stephen Rothwell
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.
Hi Christoph,
On Tue, 6 Oct 2020 07:13:01 +0200 Christoph Hellwig <[email protected]> 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.
--
Cheers,
Stephen Rothwell
On 10/6/20 7:41 AM, Stephen Rothwell wrote:
> On Tue, 6 Oct 2020 07:13:01 +0200 Christoph Hellwig <[email protected]> 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