Hi Linus, Christoph Hellwig provided one patch for the parisc architecture to drop the DMA_ERROR_CODE define from the parisc architecture. He asked me to test it and send it to you ASAP so that he can send the pull request for the dma-mapping tree. That said, can you please pull it from git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-4.13-1 before you pull Christophs dma-mapping tree ? Changes: - Drop DMA_ERROR_CODE and convert to ->mapping_error (by Christoph Hellwig) Thanks, Helge ---------------------------------------------------------------- Christoph Hellwig (1): parisc: ->mapping_error arch/parisc/include/asm/dma-mapping.h | 2 -- drivers/parisc/ccio-dma.c | 10 +++++++++- drivers/parisc/sba_iommu.c | 10 +++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html