Merge remote-tracking branch 'torvalds/master' into perf/urgent (689bb690) · Commits · EulixOS / Software / Kernel

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml

+1 −0

+21 −0

Original line number	Diff line number	Diff line
		@@ -613,6 +613,27 @@ Some of these date from the very introduction of KMS in 2008 ...

		Level: Intermediate

		Remove automatic page mapping from dma-buf importing
		----------------------------------------------------

		When importing dma-bufs, the dma-buf and PRIME frameworks automatically map
		imported pages into the importer's DMA area. drm_gem_prime_fd_to_handle() and
		drm_gem_prime_handle_to_fd() require that importers call dma_buf_attach()
		even if they never do actual device DMA, but only CPU access through
		dma_buf_vmap(). This is a problem for USB devices, which do not support DMA
		operations.

		To fix the issue, automatic page mappings should be removed from the
		buffer-sharing code. Fixing this is a bit more involved, since the import/export
		cache is also tied to &drm_gem_object.import_attach. Meanwhile we paper over
		this problem for USB devices by fishing out the USB host controller device, as
		long as that supports DMA. Otherwise importing can still needlessly fail.

		Contact: Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter

		Level: Advanced


		Better Testing
		==============

+3 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,9 @@ is dependent on the CPU capability and the kernel configuration. The limit can
		be retrieved using KVM_CAP_ARM_VM_IPA_SIZE of the KVM_CHECK_EXTENSION
		ioctl() at run-time.

		Creation of the VM will fail if the requested IPA size (whether it is
		implicit or explicit) is unsupported on the host.

		Please note that configuring the IPA size does not affect the capability
		exposed by the guest CPUs in ID_AA64MMFR0_EL1[PARange]. It only affects
		size of the address translated by the stage2 level (guest physical to

+4 −4

Original line number	Diff line number	Diff line
		@@ -261,8 +261,8 @@ ABI/API
		L: linux-api@vger.kernel.org
		F: include/linux/syscalls.h
		F: kernel/sys_ni.c
		F: include/uapi/
		F: arch/*/include/uapi/
		X: include/uapi/
		X: arch/*/include/uapi/

		ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
		M: Hans de Goede <hdegoede@redhat.com>
		@@ -5835,7 +5835,7 @@ M: David Airlie <airlied@linux.ie>
		M: Daniel Vetter <daniel@ffwll.ch>
		L: dri-devel@lists.freedesktop.org
		S: Maintained
		B: https://bugs.freedesktop.org/
		B: https://gitlab.freedesktop.org/drm
		C: irc://chat.freenode.net/dri-devel
		T: git git://anongit.freedesktop.org/drm/drm
		F: Documentation/devicetree/bindings/display/
		@@ -19166,7 +19166,7 @@ S: Maintained
		F: drivers/infiniband/hw/vmw_pvrdma/

		VMware PVSCSI driver
		M: Jim Gill <jgill@vmware.com>
		M: Vishal Bhakta <vbhakta@vmware.com>
		M: VMware PV-Drivers <pv-drivers@vmware.com>
		L: linux-scsi@vger.kernel.org
		S: Maintained

+4 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		VERSION = 5
		PATCHLEVEL = 12
		SUBLEVEL = 0
		EXTRAVERSION = -rc2
		EXTRAVERSION = -rc3
		NAME = Frozen Wasteland

		# DOCUMENTATION
		@@ -264,7 +264,8 @@ no-dot-config-targets := $(clean-targets) \
		$(version_h) headers headers_% archheaders archscripts \
		%asm-generic kernelversion %src-pkg dt_binding_check \
		outputmakefile
		no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease
		no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \
		image_name
		single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/

		config-build :=
		@@ -478,6 +479,7 @@ USERINCLUDE := \
		-I$(objtree)/arch/$(SRCARCH)/include/generated/uapi \
		-I$(srctree)/include/uapi \
		-I$(objtree)/include/generated/uapi \
		-include $(srctree)/include/linux/compiler-version.h \
		-include $(srctree)/include/linux/kconfig.h

		# Use LINUXINCLUDE when you must reference the include/ directory.