From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jul 2019 04:44:07 +0000 (-0700)
Subject: Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert... 
X-Git-Tag: v5.3-rc1~143
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=29cd581b59496c26334c910a8b848baa81a6becd;p=linux-2.6-block.git

Merge tag 'm68k-for-v5.3-tag2' of git://git./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
---

29cd581b59496c26334c910a8b848baa81a6becd
diff --cc arch/m68k/Kconfig
index 8f765cfefca6,678d3d2ff319..c518d695c376
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -3,9 -3,8 +3,9 @@@ config M68
  	bool
  	default y
  	select ARCH_32BIT_OFF_T
 +	select ARCH_HAS_BINFMT_FLAT
  	select ARCH_HAS_DMA_MMAP_PGPROT if MMU && !COLDFIRE
- 	select ARCH_HAS_DMA_PREP_COHERENT
+ 	select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
  	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
  	select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
  	select ARCH_NO_COHERENT_DMA_MMAP if !MMU