From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Shraddha Barke <shraddha.6596@gmail•com>,
Christoffer Dall <christoffer.dall@linaro•org>,
Jason Hu <jia-cheng.hu@intel•com>
Subject: linux-next: manual merge of the char-misc tree with the staging tree
Date: Tue, 16 Feb 2016 13:55:48 +1100 [thread overview]
Message-ID: <20160216135548.6da63be6@canb.auug.org.au> (raw)
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
next reply other threads:[~2016-02-16 2:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-16 2:55 Stephen Rothwell [this message]
2016-02-23 1:36 ` linux-next: manual merge of the char-misc tree with the staging tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2016-02-16 3:00 Stephen Rothwell
2014-11-10 5:53 Stephen Rothwell
2014-11-10 5:58 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160216135548.6da63be6@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=christoffer.dall@linaro$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=jia-cheng.hu@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shraddha.6596@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox