Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/platform/goldfish/goldfish_pipe.c
between commit:
1d427da1d7f9 ("Platform: goldfish: goldfish_pipe.c: Add DMA support using managed version")
from the staging tree and commits:
2f3be88237a3 ("goldfish_pipe: Pin pages to memory while copying and other cleanups")
d62f324b0ac8 ("goldfish: Enable ACPI-based enumeration for android pipe")
from the char-misc tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell
diff --cc drivers/platform/goldfish/goldfish_pipe.c
index 9f6734ce1873,839df4aace76..000000000000
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@@ -57,7 -58,8 +58,9 @@@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/goldfish.h>
+#include <linux/dma-mapping.h>
+ #include <linux/mm.h>
+ #include <linux/acpi.h>
/*
* IMPORTANT: The following constants must match the ones used and defined
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
