diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 20:00:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-24 20:00:11 -0700 |
| commit | e67095fd2f727c35e510d831c588696f2138a1bb (patch) | |
| tree | 80467ce2e93a2b3300c9900d867db00b16569360 /scripts/link-vmlinux.sh | |
| parent | 083f0f2cd402df40f62e16b1e4208e6033f52aba (diff) | |
| parent | 90ae409f9eb3bcaf38688f9ec22375816053a08e (diff) | |
Merge tag 'dma-mapping-5.3-5' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping fixes from Christoph Hellwig:
"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"
* tag 'dma-mapping-5.3-5' of git://git.infradead.org/users/hch/dma-mapping:
dma-direct: fix zone selection after an unaddressable CMA allocation
arm: select the dma-noncoherent symbols for all swiotlb builds
Diffstat (limited to 'scripts/link-vmlinux.sh')
0 files changed, 0 insertions, 0 deletions