On Tue, Feb 16, 2016 at 01:55:48PM +1100, Stephen Rothwell wrote:
> 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).
Thanks for letting me know. I've now pulled in the char-misc tree into
staging due to the confusion that was happening with this driver, people
were modifying it in both repos, so now everything should be synced up.
thanks,
greg k-h
--
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
