The following changes since commit d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1:
Linux 5.3-rc5 (2019-08-18 14:31:08 -0700)
are available in the Git repository at:
git://git.infradead.org/users/hch/dma-mapping.git tags/dma-mapping-5.3-5
for you to fetch changes up to 90ae409f9eb3bcaf38688f9ec22375816053a08e:
dma-direct: fix zone selection after an unaddressable CMA allocation
(2019-08-21 07:14:10 +0900)
----------------------------------------------------------------
dma-mapping fixes for 5.3-rc
Two fixes for regressions in this merge window:
- select the Kconfig symbols for the noncoherent dma arch helpers
on arm if swiotlb is selected, not just for LPAE to not break then
Xen build, that uses swiotlb indirectly through swiotlb-xen
- fix the page allocator fallback in dma_alloc_contiguous if the CMA
allocation fails
----------------------------------------------------------------
Christoph Hellwig (2):
arm: select the dma-noncoherent symbols for all swiotlb builds
dma-direct: fix zone selection after an unaddressable CMA allocation
arch/arm/Kconfig | 4 ++++
arch/arm/mm/Kconfig | 4 ----
drivers/iommu/dma-iommu.c | 3 +++
include/linux/dma-contiguous.h | 5 +----
kernel/dma/contiguous.c | 8 ++------
kernel/dma/direct.c | 10 +++++++++-
6 files changed, 19 insertions(+), 15 deletions(-)
