Greg Kroah-Hartman 6abcf9e5c2 Merge c183e1707a ("Merge tag 'for-5.16/dm-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm") into android-mainline ...

Steps on the way to 5.16-rc1

Resolves merge conflicts in:
	drivers/md/Kconfig

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I12d7a103b2db90569873d721a5a07fbc54c1a35b

2021-11-22 16:22:26 +01:00

..

coherent.c

dma-mapping: use 'bitmap_zalloc()' when applicable

2021-10-27 08:20:09 +02:00

contiguous.c

Merge 347d81b68b ("Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping") into android-mainline

2021-01-09 13:24:51 +01:00

debug.c

dma-debug: teach add_dma_entry() about DMA_ATTR_SKIP_CPU_SYNC

2021-10-18 12:46:45 +02:00

debug.h

dma-debug: teach add_dma_entry() about DMA_ATTR_SKIP_CPU_SYNC

2021-10-18 12:46:45 +02:00

direct.c

Merge branch 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

2021-09-03 10:34:44 -07:00

direct.h

swiotlb: Use is_swiotlb_force_bounce for swiotlb data bouncing

2021-07-13 20:04:43 -04:00

dummy.c

dma-mapping: return error code from dma_dummy_map_sg()

2021-08-09 17:13:06 +02:00

Kconfig

Merge branch 'stable/for-linus-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb

2021-09-03 10:34:44 -07:00

Makefile

Merge tag 'dma-mapping-5.11' of git://git.infradead.org/users/hch/dma-mapping

2020-12-22 13:19:43 -08:00

map_benchmark.c

dma-mapping: benchmark: Add support for multi-pages map/unmap

2021-04-02 16:41:08 +02:00

mapping.c

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2021-11-01 16:33:53 -07:00

ops_helpers.c

dma-mapping: handle vmalloc addresses in dma_common_{mmap,get_sgtable}

2021-07-16 11:30:26 +02:00

pool.c

dma-pool: no need to check return value of debugfs_create functions

2020-11-27 10:33:42 +01:00

remap.c

kernel/dma: remove unnecessary unmap_kernel_range

2021-04-30 11:20:40 -07:00

swiotlb.c

Merge branch 'akpm' (patches from Andrew)

2021-11-06 14:08:17 -07:00