summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'dma-mapping-5.4' of git://git.infradead.org/users/hch/dma-mappingLinus Torvalds2019-09-1973-674/+397
|\
| * mmc: renesas_sdhi_internal_dmac: Add MMC_CAP2_MERGE_CAPABLEYoshihiro Shimoda2019-09-121-1/+1
| * mmc: queue: Fix bigger segments usageYoshihiro Shimoda2019-09-122-1/+8
| * arm64: use asm-generic/dma-mapping.hChristoph Hellwig2019-09-113-22/+2
| * swiotlb-xen: merge xen_unmap_single into xen_swiotlb_unmap_pageChristoph Hellwig2019-09-111-11/+4
| * swiotlb-xen: simplify cache maintainanceChristoph Hellwig2019-09-115-134/+32
| * swiotlb-xen: use the same foreign page check everywhereChristoph Hellwig2019-09-111-22/+9
| * swiotlb-xen: remove xen_swiotlb_dma_mmap and xen_swiotlb_dma_get_sgtableChristoph Hellwig2019-09-111-27/+2
| * xen: remove the exports for xen_{create,destroy}_contiguous_regionChristoph Hellwig2019-09-112-4/+0
| * xen/arm: remove xen_dma_opsChristoph Hellwig2019-09-114-8/+4
| * xen/arm: simplify dma_cache_maintChristoph Hellwig2019-09-111-40/+21
| * xen/arm: use dev_is_dma_coherentChristoph Hellwig2019-09-113-21/+6
| * xen/arm: consolidate page-coherent.hChristoph Hellwig2019-09-113-150/+80
| * xen/arm: use dma-noncoherent.h calls for xen-swiotlb cache maintainanceChristoph Hellwig2019-09-114-75/+28
| * arm: remove wrappers for the generic dma remap helpersChristoph Hellwig2019-09-041-27/+5
| * dma-mapping: introduce a dma_common_find_pages helperChristoph Hellwig2019-09-044-20/+16
| * dma-mapping: always use VM_DMA_COHERENT for generic DMA remapChristoph Hellwig2019-09-045-28/+21
| * vmalloc: lift the arm flag for coherent mappings to common codeChristoph Hellwig2019-09-044-19/+13
| * dma-mapping: provide a better default ->get_required_maskChristoph Hellwig2019-09-044-27/+14
| * dma-mapping: remove the dma_declare_coherent_memory exportChristoph Hellwig2019-09-041-1/+0
| * remoteproc: don't allow modular buildChristoph Hellwig2019-09-041-1/+1
| * dma-mapping: remove the dma_mmap_from_dev_coherent exportChristoph Hellwig2019-09-041-1/+0
| * dma-mapping: remove dma_release_declared_memoryChristoph Hellwig2019-09-043-28/+0
| * dma-mapping: remove dma_{alloc,free,mmap}_writecombineChristoph Hellwig2019-09-042-15/+5
| * dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAPChristoph Hellwig2019-09-047-15/+5
| * parisc: don't set ARCH_NO_COHERENT_DMA_MMAPChristoph Hellwig2019-09-043-3/+0
| * arm-nommu: call dma_mmap_from_dev_coherent directlyChristoph Hellwig2019-09-041-2/+3
| * ALSA: pcm: use dma_can_mmap() to check if a device supports dma_mmap_*Christoph Hellwig2019-09-041-7/+6
| * dma-mapping: add a dma_can_mmap helperChristoph Hellwig2019-09-042-0/+28
| * dma-mapping: explicitly wire up ->mmap and ->get_sgtableChristoph Hellwig2019-09-0415-8/+42
| * dma-mapping: move the dma_get_sgtable API comments from arm to common codeChristoph Hellwig2019-09-042-11/+11
| * dma-mapping: fix filename referencesAndy Shevchenko2019-09-035-7/+4
| * iommu/dma: add a new dma_map_ops of get_merge_boundary()Yoshihiro Shimoda2019-09-031-0/+8
| * dma-mapping: introduce dma_get_merge_boundary()Yoshihiro Shimoda2019-09-033-0/+25
| * mmc: queue: use bigger segments if DMA MAP layer can merge the segmentsYoshihiro Shimoda2019-09-032-3/+33
| * block: add a helper function to merge the segmentsYoshihiro Shimoda2019-09-032-0/+25
| * MIPS: document mixing "slightly different CCAs"Christoph Hellwig2019-08-291-0/+7
| * arm64: document the choice of page attributes for pgprot_dmacoherentChristoph Hellwig2019-08-291-0/+8
| * dma-mapping: make dma_atomic_pool_init self-containedChristoph Hellwig2019-08-296-28/+14
| * dma-mapping: remove arch_dma_mmap_pgprotChristoph Hellwig2019-08-2913-34/+35
| * arm-nommu: remove the unused pgprot_dmacoherent defineChristoph Hellwig2019-08-261-1/+0
| * unicore32: remove the unused pgprot_dmacoherent defineChristoph Hellwig2019-08-261-2/+0
* | Merge tag 'configfs-for-5.4' of git://git.infradead.org/users/hch/configfsLinus Torvalds2019-09-195-254/+170
|\ \
| * | configfs: calculate the symlink target only onceAl Viro2019-09-114-171/+73
| * | configfs: make configfs_create() return inodeAl Viro2019-09-113-59/+39
| * | configfs: factor dirent removal into helpersChristoph Hellwig2019-09-111-30/+33
| * | configfs: fix a deadlock in configfs_symlink()Al Viro2019-09-111-1/+32
* | | Merge tag '5.4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6Linus Torvalds2019-09-1929-319/+1218
|\ \ \
| * | | cifs: update internal module version numberSteve French2019-09-171-1/+1
| * | | cifs: modefromsid: write mode ACE firstAurelien Aptel2019-09-171-17/+19