Merge 5.3-rc3 into android-mainline (bb7558ad) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/vm/hmm.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -237,7 +237,7 @@ The usage pattern is::
		ret = hmm_range_snapshot(&range);
		if (ret) {
		up_read(&mm->mmap_sem);
		if (ret == -EAGAIN) {
		if (ret == -EBUSY) {
		/*
		* No need to check hmm_range_wait_until_valid() return value
		* on retry we will get proper error with hmm_range_snapshot()

MAINTAINERS

+12 −1

Original line number	Diff line number	Diff line
		@@ -2155,10 +2155,12 @@ F: Documentation/devicetree/bindings/arm/realtek.txt

		ARM/RENESAS ARM64 ARCHITECTURE
		M: Simon Horman <horms@verge.net.au>
		M: Geert Uytterhoeven <geert+renesas@glider.be>
		M: Magnus Damm <magnus.damm@gmail.com>
		L: linux-renesas-soc@vger.kernel.org
		Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
		S: Supported
		F: arch/arm64/boot/dts/renesas/
		F: Documentation/devicetree/bindings/arm/renesas.yaml
		@@ -2269,10 +2271,12 @@ F: drivers/media/platform/s5p-mfc/

		ARM/SHMOBILE ARM ARCHITECTURE
		M: Simon Horman <horms@verge.net.au>
		M: Geert Uytterhoeven <geert+renesas@glider.be>
		M: Magnus Damm <magnus.damm@gmail.com>
		L: linux-renesas-soc@vger.kernel.org
		Q: http://patchwork.kernel.org/project/linux-renesas-soc/list/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git next
		S: Supported
		F: arch/arm/boot/dts/emev2*
		F: arch/arm/boot/dts/gr-peach*
		@@ -6322,7 +6326,8 @@ F: Documentation/devicetree/bindings/counter/ftm-quaddec.txt
		F: drivers/counter/ftm-quaddec.c

		FLOPPY DRIVER
		S: Orphan
		M: Denis Efremov <efremov@linux.com>
		S: Odd Fixes
		L: linux-block@vger.kernel.org
		F: drivers/block/floppy.c

		@@ -14016,6 +14021,12 @@ F: drivers/media/common/saa7146/
		F: drivers/media/pci/saa7146/
		F: include/media/drv-intf/saa7146*

		SAFESETID SECURITY MODULE
		M: Micah Morton <mortonm@chromium.org>
		S: Supported
		F: security/safesetid/
		F: Documentation/admin-guide/LSM/SafeSetID.rst

		SAMSUNG AUDIO (ASoC) DRIVERS
		M: Krzysztof Kozlowski <krzk@kernel.org>
		M: Sangbeom Kim <sbkim73@samsung.com>

Makefile

+3 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 3
		SUBLEVEL = 0
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Bobtail Squid

		# DOCUMENTATION
		@@ -472,6 +472,7 @@ KBUILD_CFLAGS_MODULE := -DMODULE
		KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds
		KBUILD_LDFLAGS :=
		GCC_PLUGINS_CFLAGS :=
		CLANG_FLAGS :=

		export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
		export CPP AR NM STRIP OBJCOPY OBJDUMP PAHOLE KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS
		@@ -520,7 +521,7 @@ endif
		ifneq ($(shell $(CC) --version 2>&1 \| head -n 1 \| grep clang),)
		ifneq ($(CROSS_COMPILE),)
		CLANG_TRIPLE ?= $(CROSS_COMPILE)
		CLANG_FLAGS := --target=$(notdir $(CLANG_TRIPLE:%-=%))
		CLANG_FLAGS += --target=$(notdir $(CLANG_TRIPLE:%-=%))
		ifeq ($(shell $(srctree)/scripts/clang-android.sh $(CC) $(CLANG_FLAGS)), y)
		$(error "Clang with Android --target detected. Did you specify CLANG_TRIPLE?")
		endif

arch/arm/include/asm/dma-mapping.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@ extern const struct dma_map_ops arm_coherent_dma_ops;

		static inline const struct dma_map_ops get_arch_dma_ops(struct bus_type bus)
		{
		return IS_ENABLED(CONFIG_MMU) ? &arm_dma_ops : NULL;
		if (IS_ENABLED(CONFIG_MMU) && !IS_ENABLED(CONFIG_ARM_LPAE))
		return &arm_dma_ops;
		return NULL;
		}

		#ifdef __arch_page_to_dma

arch/arm/mm/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -663,6 +663,11 @@ config ARM_LPAE
		depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \
		!CPU_32v4 && !CPU_32v3
		select PHYS_ADDR_T_64BIT
		select SWIOTLB
		select ARCH_HAS_DMA_COHERENT_TO_PFN
		select ARCH_HAS_DMA_MMAP_PGPROT
		select ARCH_HAS_SYNC_DMA_FOR_DEVICE
		select ARCH_HAS_SYNC_DMA_FOR_CPU
		help
		Say Y if you have an ARMv7 processor supporting the LPAE page
		table format and you would like to access memory beyond the