[Linux-Xtensa] xtensa build failures in -next due to DMA API changes

Chris Zankel chris at zankel.net
Wed Aug 26 17:53:07 UTC 2015


I'll send the pull request as soon as possible.

On Wed, Aug 26, 2015 at 12:59 AM, Andrew Morton
<akpm at linux-foundation.org> wrote:
> On Wed, 26 Aug 2015 10:53:25 +0300 Max Filippov <jcmvbkbc at gmail.com> wrote:
>
>> On Tue, Aug 25, 2015 at 11:24 PM, Christoph Hellwig <hch at lst.de> wrote:
>> > On Tue, Aug 25, 2015 at 01:21:40PM -0700, Guenter Roeck wrote:
>> >> I also see
>> >>
>> >> arch/xtensa/include/asm/dma-mapping.h:#include <asm-generic/dma-mapping-common.h>
>> >>
>> >> It looks like there is a conflict with "xtensa: reimplement DMA API using common
>> >> helpers" by Max Filippov, which added the include. This patch is in -next.
>> >
>> > Oh.  That one clashes badly with my whole series, basically each
>> > of my patches will need the same work done for the other architectures
>> > applied to xtensa as well.
>> >
>> > In terms of effort it might be a better idea to rebase the patch from
>> > Max on top of the series, as it will become a lot simpler that way.
>>
>> Looks like I just need to remove now redundant function definitions from
>> xtensa/include/asm/dma-mapping.h. A patch that removes these
>> functions is attached, but I'm not sure where it should go. To the Andrew's
>> tree? Or should the xtensa tree merge Christoph's series and apply it on
>> top?
>
> I can add it to Christoph's patch series.  This means that I won't be
> merging Christoph's patches until you've sent your queue in to Linus, so
> please don't leave it too late in the merge window.
>


More information about the linux-xtensa mailing list