one parisc patch for v4.13-rc1
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(-)
Quoted 3 lines · Helge Deller
That said, can you please pull it from
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.gitparisc-4.13-1
before you pull Christophs dma-mapping tree ?
I've not send the pull request for that yet, I plan to do so once this commit made it in.
Quoted 7 lines · Helge Deller
That said, can you please pull it from
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.gitparisc-4.13-1
before you pull Christophs dma-mapping tree ?Changes:
- DropDMA_ERROR_CODEand convert to ->mapping_error (by Christoph Hellwig)
There are no such changes there.
Did you perhaps mean 'parisc-4.13-2' instead?
Linus
Quoted 5 lines · Linus Torvalds
Quoted 2 lines · Helge Deller
git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.gitparisc-4.13-1Did you perhaps mean 'parisc-4.13-2' instead?
Yeah, that branch seems to match what you describe, the -1 branch hasn't changed since you asked me to pull it earlier.
Linus