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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
