| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20160216135548.6da63be6@canb.auug.org.au>
Date: Tue, 16 Feb 2016 13:55:48 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, Arnd Bergmann <arnd@...db.de>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Shraddha Barke <shraddha.6596@...il.com>,
Christoffer Dall <christoffer.dall@...aro.org>,
Jason Hu <jia-cheng.hu@...el.com>
Subject: linux-next: manual merge of the char-misc tree with the staging
tree
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
Powered by blists - more mailing lists