Hi all,
After merging the akpm tree, today's linux-next build (x86_64 allnoconfig)
failed like this:
Caused by commit
a20bb0583751 ("dma-direct: add an explicit dma_direct_get_required_mask")
from the dma-mappgin tree conflicting with patch
"mm: remove include/linux/bootmem.h"
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 2 Oct 2018 18:49:02 +1000
Subject: [PATCH] dma-direct: fix up for the removal of linux/bootmem.h
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
kernel/dma/direct.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 170bd322a94a..5a0806b5351b 100644
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -4,7 +4,7 @@
*
* DMA operations that map physical memory directly without using an IOMMU.
*/
-#include <linux/bootmem.h> /* for max_pfn */
+#include <linux/memblock.h> /* for max_pfn */
#include <linux/export.h>
#include <linux/mm.h>
#include <linux/dma-direct.h>
--
2.18.0
--
Cheers,
Stephen Rothwell
Attachment:
pgpnURYxzntNv.pgp
Description: OpenPGP digital signature
