Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1681781 > unrolled thread
| Started by | Helge Deller <deller@gmx.de> |
|---|---|
| First post | 2017-07-05 22:30 +0200 |
| Last post | 2017-07-06 02:50 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[GIT PULL] one parisc patch for v4.13-rc1 Helge Deller <deller@gmx.de> - 2017-07-05 22:30 +0200
Re: [GIT PULL] one parisc patch for v4.13-rc1 Christoph Hellwig <hch@infradead.org> - 2017-07-05 22:40 +0200
Re: [GIT PULL] one parisc patch for v4.13-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-07-06 02:50 +0200
Re: [GIT PULL] one parisc patch for v4.13-rc1 Linus Torvalds <torvalds@linux-foundation.org> - 2017-07-06 02:50 +0200
| From | Helge Deller <deller@gmx.de> |
|---|---|
| Date | 2017-07-05 22:30 +0200 |
| Subject | [GIT PULL] one parisc patch for v4.13-rc1 |
| Message-ID | <tZZ5U-2Lm-15@gated-at.bofh.it> |
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(-)
[toc] | [next] | [standalone]
| From | Christoph Hellwig <hch@infradead.org> |
|---|---|
| Date | 2017-07-05 22:40 +0200 |
| Message-ID | <tZZfA-2Op-15@gated-at.bofh.it> |
| In reply to | #1681781 |
On Wed, Jul 05, 2017 at 10:28:54PM +0200, Helge Deller wrote: > 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 ? I've not send the pull request for that yet, I plan to do so once this commit made it in.
[toc] | [prev] | [next] | [standalone]
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Date | 2017-07-06 02:50 +0200 |
| Message-ID | <u039v-5kK-11@gated-at.bofh.it> |
| In reply to | #1681781 |
On Wed, Jul 5, 2017 at 5:41 PM, Linus Torvalds
<torvalds@linux-foundation.org> wrote:
> On Wed, Jul 5, 2017 at 1:28 PM, Helge Deller <deller@gmx.de> wrote:
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-4.13-1
>
> Did 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
[toc] | [prev] | [next] | [standalone]
| From | Linus Torvalds <torvalds@linux-foundation.org> |
|---|---|
| Date | 2017-07-06 02:50 +0200 |
| Message-ID | <u039v-5kK-13@gated-at.bofh.it> |
| In reply to | #1681781 |
On Wed, Jul 5, 2017 at 1:28 PM, Helge Deller <deller@gmx.de> wrote:
>
> 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)
There are no such changes there.
Did you perhaps mean 'parisc-4.13-2' instead?
Linus
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web