| commit | 29cd581b59496c26334c910a8b848baa81a6becd | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 10 21:44:07 2019 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 10 21:44:07 2019 -0700 |
| tree | fa20e332ebb21af2bc8f8cb89051a3a10ac6a4a2 | |
| parent | 398364a35daed7361e76c3666fb9a97792edce09 [diff] | |
| parent | f28a1f16135c9c6366f3d3f20f2e58aefc99afa0 [diff] |
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