projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 398364a f28a1f1)
Merge tag 'm68k-for-v5.3-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2019 04:44:07 +0000 (21:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Jul 2019 04:44:07 +0000 (21:44 -0700)
commit29cd581b59496c26334c910a8b848baa81a6becd
treefa20e332ebb21af2bc8f8cb89051a3a10ac6a4a2tree | snapshot
parent398364a35daed7361e76c3666fb9a97792edce09commit | diff
parentf28a1f16135c9c6366f3d3f20f2e58aefc99afa0commit | diff
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
arch/m68k/Kconfig diff1 | diff2 | blob | history
MicroBlaze GIT Repository