Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64282ea2 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge airlied/drm-next into drm-intel-next-queued



Resync with upstream to avoid git getting too badly confused. Also, we
have a conflict with the drm_vblank_cleanup removal, which cannot be
resolved by simply taking our side. Bake that in properly.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parents d2939424 e6742e10
Loading
Loading
Loading
Loading
+2 −6
Original line number Original line Diff line number Diff line
@@ -24,8 +24,6 @@ DMA-ISA-LPC.txt
	- How to do DMA with ISA (and LPC) devices.
	- How to do DMA with ISA (and LPC) devices.
DMA-attributes.txt
DMA-attributes.txt
	- listing of the various possible attributes a DMA region can have
	- listing of the various possible attributes a DMA region can have
DocBook/
	- directory with DocBook templates etc. for kernel documentation.
EDID/
EDID/
	- directory with info on customizing EDID for broken gfx/displays.
	- directory with info on customizing EDID for broken gfx/displays.
IPMI.txt
IPMI.txt
@@ -40,8 +38,6 @@ Intel-IOMMU.txt
	- basic info on the Intel IOMMU virtualization support.
	- basic info on the Intel IOMMU virtualization support.
Makefile
Makefile
	- It's not of interest for those who aren't touching the build system.
	- It's not of interest for those who aren't touching the build system.
Makefile.sphinx
	- It's not of interest for those who aren't touching the build system.
PCI/
PCI/
	- info related to PCI drivers.
	- info related to PCI drivers.
RCU/
RCU/
@@ -246,8 +242,6 @@ kprobes.txt
	- documents the kernel probes debugging feature.
	- documents the kernel probes debugging feature.
kref.txt
kref.txt
	- docs on adding reference counters (krefs) to kernel objects.
	- docs on adding reference counters (krefs) to kernel objects.
kselftest.txt
	- small unittests for (some) individual codepaths in the kernel.
laptops/
laptops/
	- directory with laptop related info and laptop driver documentation.
	- directory with laptop related info and laptop driver documentation.
ldm.txt
ldm.txt
@@ -264,6 +258,8 @@ logo.gif
	- full colour GIF image of Linux logo (penguin - Tux).
	- full colour GIF image of Linux logo (penguin - Tux).
logo.txt
logo.txt
	- info on creator of above logo & site to get additional images from.
	- info on creator of above logo & site to get additional images from.
lsm.txt
	- Linux Security Modules: General Security Hooks for Linux
lzo.txt
lzo.txt
	- kernel LZO decompressor input formats
	- kernel LZO decompressor input formats
m68k/
m68k/
+8 −8
Original line number Original line Diff line number Diff line
@@ -55,14 +55,6 @@ Description:
		Indicates the maximum USB speed supported by this port.
		Indicates the maximum USB speed supported by this port.
Users:
Users:


What:		/sys/class/udc/<udc>/maximum_speed
Date:		June 2011
KernelVersion:	3.1
Contact:	Felipe Balbi <balbi@kernel.org>
Description:
		Indicates the maximum USB speed supported by this port.
Users:

What:		/sys/class/udc/<udc>/soft_connect
What:		/sys/class/udc/<udc>/soft_connect
Date:		June 2011
Date:		June 2011
KernelVersion:	3.1
KernelVersion:	3.1
@@ -91,3 +83,11 @@ Description:
		'configured', and 'suspended'; however not all USB Device
		'configured', and 'suspended'; however not all USB Device
		Controllers support reporting all states.
		Controllers support reporting all states.
Users:
Users:

What:		/sys/class/udc/<udc>/function
Date:		June 2017
KernelVersion:	4.13
Contact:	Felipe Balbi <balbi@kernel.org>
Description:
		Prints out name of currently running USB Gadget Driver.
Users:
+15 −0
Original line number Original line Diff line number Diff line
What:		/sys/bus/platform/drivers/aspeed-vuart/*/lpc_address
Date:		April 2017
Contact:	Jeremy Kerr <jk@ozlabs.org>
Description:	Configures which IO port the host side of the UART
		will appear on the host <-> BMC LPC bus.
Users:		OpenBMC.  Proposed changes should be mailed to
		openbmc@lists.ozlabs.org

What:		/sys/bus/platform/drivers/aspeed-vuart*/sirq
Date:		April 2017
Contact:	Jeremy Kerr <jk@ozlabs.org>
Description:	Configures which interrupt number the host side of
		the UART will appear on the host <-> BMC LPC bus.
Users:		OpenBMC.  Proposed changes should be mailed to
		openbmc@lists.ozlabs.org
+119 −0
Original line number Original line Diff line number Diff line
What:		/sys/hypervisor/compilation/compile_date
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Contains the build time stamp of the Xen hypervisor
		Might return "<denied>" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/compilation/compiled_by
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Contains information who built the Xen hypervisor
		Might return "<denied>" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/compilation/compiler
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Compiler which was used to build the Xen hypervisor
		Might return "<denied>" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/properties/capabilities
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Space separated list of supported guest system types. Each type
		is in the format: <class>-<major>.<minor>-<arch>
		With:
			<class>: "xen" -- x86: paravirtualized, arm: standard
				 "hvm" -- x86 only: fully virtualized
			<major>: major guest interface version
			<minor>: minor guest interface version
			<arch>:  architecture, e.g.:
				 "x86_32": 32 bit x86 guest without PAE
				 "x86_32p": 32 bit x86 guest with PAE
				 "x86_64": 64 bit x86 guest
				 "armv7l": 32 bit arm guest
				 "aarch64": 64 bit arm guest

What:		/sys/hypervisor/properties/changeset
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Changeset of the hypervisor (git commit)
		Might return "<denied>" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/properties/features
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Features the Xen hypervisor supports for the guest as defined
		in include/xen/interface/features.h printed as a hex value.

What:		/sys/hypervisor/properties/pagesize
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Default page size of the hypervisor printed as a hex value.
		Might return "0" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/properties/virtual_start
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Virtual address of the hypervisor as a hex value.

What:		/sys/hypervisor/type
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		Type of hypervisor:
		"xen": Xen hypervisor

What:		/sys/hypervisor/uuid
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		UUID of the guest as known to the Xen hypervisor.

What:		/sys/hypervisor/version/extra
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		The Xen version is in the format <major>.<minor><extra>
		This is the <extra> part of it.
		Might return "<denied>" in case of special security settings
		in the hypervisor.

What:		/sys/hypervisor/version/major
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		The Xen version is in the format <major>.<minor><extra>
		This is the <major> part of it.

What:		/sys/hypervisor/version/minor
Date:		March 2009
KernelVersion:	2.6.30
Contact:	xen-devel@lists.xenproject.org
Description:	If running under Xen:
		The Xen version is in the format <major>.<minor><extra>
		This is the <minor> part of it.
+10 −8
Original line number Original line Diff line number Diff line
What:		/config/usb-gadget/gadget/functions/uac1.name
What:		/config/usb-gadget/gadget/functions/uac1.name
Date:		Sep 2014
Date:		June 2017
KernelVersion:	3.18
KernelVersion:	4.14
Description:
Description:
		The attributes:
		The attributes:


		audio_buf_size - audio buffer size
		c_chmask - capture channel mask
		fn_cap - capture pcm device file name
		c_srate - capture sampling rate
		fn_cntl - control device file name
		c_ssize - capture sample size (bytes)
		fn_play - playback pcm device file name
		p_chmask - playback channel mask
		req_buf_size - ISO OUT endpoint request buffer size
		p_srate - playback sampling rate
		req_count - ISO OUT endpoint request count
		p_ssize - playback sample size (bytes)
		req_number - the number of pre-allocated request
			for both capture and playback
Loading