Greg Kroah-Hartman fd30fc5ebe Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline ... Steps on the way to 5.11-rc1 Resolves conflicts in: drivers/soc/qcom/rpmh-rsc.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Idc5921088554d0eb5bed7eca94c7fd7ca0fa6fb5		2020-12-21 09:54:59 +01:00
..
coherent.c	dma-mapping: split <linux/dma-mapping.h>	2020-10-06 07:07:03 +02:00
contiguous.c	ANDROID: dma: Rework so dev_get_cma_area() can be called from a module	2020-11-03 22:55:50 +00:00
debug.c	dma-mapping: move dma-debug.h to kernel/dma/	2020-10-06 07:07:05 +02:00
debug.h	dma-mapping: move dma-debug.h to kernel/dma/	2020-10-06 07:07:05 +02:00
direct.c	Merge ff49c86f27 ("Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs") into android-mainline	2020-12-21 09:54:59 +01:00
direct.h	dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma	2020-10-06 07:07:06 +02:00
dummy.c	dma-mapping: split <linux/dma-mapping.h>	2020-10-06 07:07:03 +02:00
Kconfig	dma-mapping: remove dma_virt_ops	2020-11-17 15:22:07 -04:00
Makefile	dma-mapping: remove dma_virt_ops	2020-11-17 15:22:07 -04:00
mapping.c	dma-mapping: move large parts of <linux/dma-direct.h> to kernel/dma	2020-10-06 07:07:06 +02:00
ops_helpers.c	Merge 5a32c3413d ("Merge tag 'dma-mapping-5.10' of git://git.infradead.org/users/hch/dma-mapping") into android-mainline	2020-10-26 08:06:17 +01:00
pool.c	dma-mapping: merge <linux/dma-noncoherent.h> into <linux/dma-map-ops.h>	2020-10-06 07:07:06 +02:00
remap.c	dma-mapping: move more functions to dma-map-ops.h	2020-10-20 10:41:07 +02:00
swiotlb.c	x86,swiotlb: Adjust SWIOTLB bounce buffer size for SEV guests	2020-12-11 15:43:41 -05:00