Greg Kroah-Hartman 05d2a661fd Merge 54a4c789ca ("Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline ... Steps on the way to 5.10-rc1 Resolves conflicts in: fs/userfaultfd.c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ie3fe3c818f1f6565cfd4fa551de72d2b72ef60af		2020-10-26 09:23:33 +01:00
..
coherent.c	dma-mapping: split <linux/dma-mapping.h>	2020-10-06 07:07:03 +02:00
contiguous.c	dma-mapping updates for 5.10	2020-10-15 14:43:29 -07: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 54a4c789ca ("Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media") into android-mainline	2020-10-26 09:23:33 +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: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h>	2020-10-06 07:07:04 +02:00
Makefile	dma-mapping: move dma_common_{mmap,get_sgtable} out of mapping.c	2020-09-11 09:14:56 +02: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-remap: align the size in dma_common_*_remap()	2020-06-23 14:14:41 +02:00
swiotlb.c	dma-mapping updates for 5.10	2020-10-15 14:43:29 -07:00
virt.c	dma-mapping: split <linux/dma-mapping.h>	2020-10-06 07:07:03 +02:00