Merge remote-tracking branch 'iomem-mmap-vs-gup/topic/iomem-mmap-vs-gup'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)
diff --cc drivers/media/common/videobuf2/frame_vector.c
Simple merge
diff --cc include/linux/mm.h
Simple merge
diff --cc mm/memory.c
Simple merge
diff --cc security/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 08:19:09 +0000 (18:19 +1000)
		1	2
drivers/media/common/videobuf2/frame_vector.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/memory.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history