diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 11:11:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-14 11:11:52 -0700 |
commit | f66dc7232002f032ffd860940f98732898ebfd79 (patch) | |
tree | fbe7246bab0cbb52acf7b3623199baf2ad4dc662 /fs/configfs/item.c | |
parent | b219a1d2de0c025318475e3bbf8e3215cf49d083 (diff) | |
parent | 6fa1d28e38cfa0c90f8d64c0cab37769e5337b85 (diff) | |
download | linux-f66dc7232002f032ffd860940f98732898ebfd79.tar.bz2 |
Merge tag 'dma-mapping-4.19' of git://git.infradead.org/users/hch/dma-mapping
Pull dma-mapping updates from Christoph Hellwig:
- a series from Robin to fix bus imposed dma limits by adding a
separate mask for them to struct device instead of trying to squeeze
a second meaning out of the existing dma mask as we did before.
This has ACKs from the various other subsystems touched
- a small swiotlb cleanup from Kees (acked by Konrad)
- conversion of nios2 and sh to the new generic dma-noncoherent code.
Various other architecture conversions will come through the
architectures maintainers trees.
* tag 'dma-mapping-4.19' of git://git.infradead.org/users/hch/dma-mapping:
sh: use generic dma_noncoherent_ops
sh: split arch/sh/mm/consistent.c
sh: use dma_direct_ops for the CONFIG_DMA_COHERENT case
sh: introduce a sh_cacheop_vaddr helper
sh: simplify get_arch_dma_ops
OF: Don't set default coherent DMA mask
ACPI/IORT: Don't set default coherent DMA mask
iommu/dma: Respect bus DMA limit for IOVAs
of/device: Set bus DMA mask as appropriate
ACPI/IORT: Set bus DMA mask as appropriate
dma-mapping: Generalise dma_32bit_limit flag
ACPI/IORT: Support address size limit for root complexes
of/platform: Initialise default DMA masks
nios2: use generic dma_noncoherent_ops
swiotlb: clean up reporting
dma-mapping: relax warning for per-device areas
Diffstat (limited to 'fs/configfs/item.c')
0 files changed, 0 insertions, 0 deletions