Skip to contentSkip to conversation

dma mapping fixes for 5.3-rc

GIT PULL Merged Christoph Hellwig 2 participants 2 messages Aug 14, 2019

lore
Share & tools
lore
#0 lore raw

The following changes since commit 451577f3e3a9bf1861218641dbbf98e214e77851:

Merge tag 'kbuild-fixes-v5.3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild (2019-08-09 20:31:04 -0700)

are available in the Git repository at:

git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.3-4

for you to fetch changes up to 33dcb37cef741294b481f4d889a465b8091f11bf:

dma-mapping: fix page attributes for dma_mmap_* (2019-08-10 19:52:45 +0200)

----------------------------------------------------------------
dma-mapping fixes for 5.3-rc

- fix the handling of the bus_dma_mask in dma_get_required_mask, which caused a regression in this merge window (Lucas Stach)
- fix a regression in the handling of DMA_ATTR_NO_KERNEL_MAPPING (me)
- fix dma_mmap_coherent to not cause page attribute mismatches on coherent architectures like x86 (me)

----------------------------------------------------------------
Christoph Hellwig (2):
dma-direct: fix DMA_ATTR_NO_KERNEL_MAPPING
dma-mapping: fix page attributes for dma_mmap_*

Lucas Stach (1):
dma-direct: don't truncate dma_required_mask to bus addressing capabilities

 arch/arm/mm/dma-mapping.c        |  4 +---
 arch/arm64/mm/dma-mapping.c      |  4 +---
 arch/powerpc/Kconfig             |  1 -
 arch/powerpc/kernel/Makefile     |  3 +--
 arch/powerpc/kernel/dma-common.c | 17 -----------------
 drivers/iommu/dma-iommu.c        |  6 +++---
 include/linux/dma-noncoherent.h  | 13 +++++++++----
 kernel/dma/direct.c              | 10 +++++-----
 kernel/dma/mapping.c             | 19 ++++++++++++++++++-
 kernel/dma/remap.c               |  2 +-
 10 files changed, 39 insertions(+), 40 deletions(-)
 delete mode 100644 arch/powerpc/kernel/dma-common.c
merge bot Merged
#1 lore raw
The pull request you sent on Wed, 14 Aug 2019 16:12:17 +0200:

The pull request you sent on Wed, 14 Aug 2019 16:12:17 +0200:

Quoted 1 line

git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.3-4

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

Thank you!

Signature · 6 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu