diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-10 21:44:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-10 21:44:07 -0700 |
| commit | 29cd581b59496c26334c910a8b848baa81a6becd (patch) | |
| tree | fa20e332ebb21af2bc8f8cb89051a3a10ac6a4a2 /arch/ia64/kernel | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu (diff) | |
| parent | m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire (diff) | |
| download | linux-dev-29cd581b59496c26334c910a8b848baa81a6becd.tar.xz linux-dev-29cd581b59496c26334c910a8b848baa81a6becd.zip | |
Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven:
"Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire.
This is a fix for an issue detected in next, to avoid introducing
build failures when merging Christoph's dma-mapping tree later"
* tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire
Diffstat (limited to 'arch/ia64/kernel')
0 files changed, 0 insertions, 0 deletions