Skip to contentSkip to conversation

m68k updates for 5.3 (take two)

GIT PULL Merged Geert Uytterhoeven 2 participants 2 messages Jul 10, 2019 – Jul 11, 2019

lore
Share & tools
lore
#0 lore raw

Hi Linus,

The following changes since commit 69878ef47562f32e02d0b7975c990e1c0339320d:

m68k: Implement arch_dma_prep_coherent() (2019-07-01 11:17:00 +0200)

are available in the Git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git tags/m68k-for-v5.3-tag2

for you to fetch changes up to f28a1f16135c9c6366f3d3f20f2e58aefc99afa0:

m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire (2019-07-09 09:13:24 +0200)

----------------------------------------------------------------
m68k updates for v5.3 (take two)

- 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.

Thanks for pulling!

----------------------------------------------------------------
Christoph Hellwig (1):
m68k: Don't select ARCH_HAS_DMA_PREP_COHERENT for nommu or coldfire

 arch/m68k/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

merge bot Merged
#1 lore raw
The pull request you sent on Wed, 10 Jul 2019 14:11:20 +0200:

The pull request you sent on Wed, 10 Jul 2019 14:11:20 +0200:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git tags/m68k-for-v5.3-tag2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/29cd581b59496c26334c910a8b848baa81a6becd

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker