Merge tag 'v4.18-rc2' into next-general (57b54d74) · Commits · e / devices / android_kernel_fairphone_FP5

.mailmap

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -186,6 +186,9 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
			Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
			Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
			Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Documentation/00-INDEX

+0 −10

Original line number	Original line	Diff line number	Diff line
	@@ -64,8 +64,6 @@ auxdisplay/
	- misc. LCD driver documentation (cfag12864b, ks0108).		- misc. LCD driver documentation (cfag12864b, ks0108).
	backlight/		backlight/
	- directory with info on controlling backlights in flat panel displays		- directory with info on controlling backlights in flat panel displays
	bcache.txt
	- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
	block/		block/
	- info on the Block I/O (BIO) layer.		- info on the Block I/O (BIO) layer.
	blockdev/		blockdev/
	@@ -78,18 +76,10 @@ bus-devices/
	- directory with info on TI GPMC (General Purpose Memory Controller)		- directory with info on TI GPMC (General Purpose Memory Controller)
	bus-virt-phys-mapping.txt		bus-virt-phys-mapping.txt
	- how to access I/O mapped memory from within device drivers.		- how to access I/O mapped memory from within device drivers.
	cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.
	cdrom/		cdrom/
	- directory with information on the CD-ROM drivers that Linux has.		- directory with information on the CD-ROM drivers that Linux has.
	cgroup-v1/		cgroup-v1/
	- cgroups v1 features, including cpusets and memory controller.		- cgroups v1 features, including cpusets and memory controller.
	cgroup-v2.txt
	- cgroups v2 features, including cpusets and memory controller.
	circular-buffers.txt
	- how to make use of the existing circular buffer infrastructure
	clk.txt
	- info on the common clock framework
	cma/		cma/
	- Continuous Memory Area (CMA) debugfs interface.		- Continuous Memory Area (CMA) debugfs interface.
	conf.py		conf.py

Documentation/ABI/obsolete/sysfs-gpio

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,7 @@ Description:
	Kernel code may export it for complete or partial access.		Kernel code may export it for complete or partial access.

	GPIOs are identified as they are inside the kernel, using integers in		GPIOs are identified as they are inside the kernel, using integers in
	the range 0..INT_MAX. See Documentation/gpio/gpio.txt for more information.		the range 0..INT_MAX. See Documentation/gpio for more information.

	/sys/class/gpio		/sys/class/gpio
	/export ... asks the kernel to export a GPIO to userspace		/export ... asks the kernel to export a GPIO to userspace

Documentation/ABI/removed/sysfs-bus-nfit

0 → 100644

+17 −0

Original line number	Original line	Diff line number	Diff line
			What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
			Date: Aug, 2017
			KernelVersion: v4.14 (Removed v4.18)
			Contact: linux-nvdimm@lists.01.org
			Description:
			(RO) Size of a write request to a DIMM that will not incur a
			read-modify-write cycle at the memory controller.

			When the nfit driver initializes it runs an ARS (Address Range
			Scrub) operation across every pmem range. Part of that process
			involves determining the ARS capabilities of a given address
			range. One of the capabilities that is reported is the 'Clear
			Uncorrectable Error Range Length Unit Size' (see: ACPI 6.2
			section 9.20.7.4 Function Index 1 - Query ARS Capabilities).
			This property indicates the boundary at which the NVDIMM may
			need to perform read-modify-write cycles to maintain ECC (Error
			Correcting Code) blocks.

Documentation/ABI/stable/sysfs-bus-vmbus

+20 −20

Original line number	Original line	Diff line number	Diff line
	What: /sys/bus/vmbus/devices/vmbus_*/id		What: /sys/bus/vmbus/devices/<UUID>/id
	Date: Jul 2009		Date: Jul 2009
	KernelVersion: 2.6.31		KernelVersion: 2.6.31
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The VMBus child_relid of the device's primary channel		Description: The VMBus child_relid of the device's primary channel
	Users: tools/hv/lsvmbus		Users: tools/hv/lsvmbus

	What: /sys/bus/vmbus/devices/vmbus_*/class_id		What: /sys/bus/vmbus/devices/<UUID>/class_id
	Date: Jul 2009		Date: Jul 2009
	KernelVersion: 2.6.31		KernelVersion: 2.6.31
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The VMBus interface type GUID of the device		Description: The VMBus interface type GUID of the device
	Users: tools/hv/lsvmbus		Users: tools/hv/lsvmbus

	What: /sys/bus/vmbus/devices/vmbus_*/device_id		What: /sys/bus/vmbus/devices/<UUID>/device_id
	Date: Jul 2009		Date: Jul 2009
	KernelVersion: 2.6.31		KernelVersion: 2.6.31
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The VMBus interface instance GUID of the device		Description: The VMBus interface instance GUID of the device
	Users: tools/hv/lsvmbus		Users: tools/hv/lsvmbus

	What: /sys/bus/vmbus/devices/vmbus_*/channel_vp_mapping		What: /sys/bus/vmbus/devices/<UUID>/channel_vp_mapping
	Date: Jul 2015		Date: Jul 2015
	KernelVersion: 4.2.0		KernelVersion: 4.2.0
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	@@ -28,112 +28,112 @@ Description: The mapping of which primary/sub channels are bound to which
	Format: <channel's child_relid:the bound cpu's number>		Format: <channel's child_relid:the bound cpu's number>
	Users: tools/hv/lsvmbus		Users: tools/hv/lsvmbus

	What: /sys/bus/vmbus/devices/vmbus_*/device		What: /sys/bus/vmbus/devices/<UUID>/device
	Date: Dec. 2015		Date: Dec. 2015
	KernelVersion: 4.5		KernelVersion: 4.5
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The 16 bit device ID of the device		Description: The 16 bit device ID of the device
	Users: tools/hv/lsvmbus and user level RDMA libraries		Users: tools/hv/lsvmbus and user level RDMA libraries

	What: /sys/bus/vmbus/devices/vmbus_*/vendor		What: /sys/bus/vmbus/devices/<UUID>/vendor
	Date: Dec. 2015		Date: Dec. 2015
	KernelVersion: 4.5		KernelVersion: 4.5
	Contact: K. Y. Srinivasan <kys@microsoft.com>		Contact: K. Y. Srinivasan <kys@microsoft.com>
	Description: The 16 bit vendor ID of the device		Description: The 16 bit vendor ID of the device
	Users: tools/hv/lsvmbus and user level RDMA libraries		Users: tools/hv/lsvmbus and user level RDMA libraries

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Directory for per-channel information		Description: Directory for per-channel information
	NN is the VMBUS relid associtated with the channel.		NN is the VMBUS relid associtated with the channel.

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: VCPU (sub)channel is affinitized to		Description: VCPU (sub)channel is affinitized to
	Users: tools/hv/lsvmbus and other debugging tools		Users: tools/hv/lsvmbus and other debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/cpu		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/cpu
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: VCPU (sub)channel is affinitized to		Description: VCPU (sub)channel is affinitized to
	Users: tools/hv/lsvmbus and other debugging tools		Users: tools/hv/lsvmbus and other debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/in_mask		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/in_mask
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Host to guest channel interrupt mask		Description: Host to guest channel interrupt mask
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/latency		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/latency
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Channel signaling latency		Description: Channel signaling latency
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/out_mask		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/out_mask
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Guest to host channel interrupt mask		Description: Guest to host channel interrupt mask
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/pending		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/pending
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Channel interrupt pending state		Description: Channel interrupt pending state
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/read_avail		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/read_avail
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Bytes available to read		Description: Bytes available to read
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/write_avail		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/write_avail
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Bytes available to write		Description: Bytes available to write
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/events		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/events
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Number of times we have signaled the host		Description: Number of times we have signaled the host
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/interrupts		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/interrupts
	Date: September. 2017		Date: September. 2017
	KernelVersion: 4.14		KernelVersion: 4.14
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Number of times we have taken an interrupt (incoming)		Description: Number of times we have taken an interrupt (incoming)
	Users: Debugging tools		Users: Debugging tools

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/subchannel_id		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/subchannel_id
	Date: January. 2018		Date: January. 2018
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Subchannel ID associated with VMBUS channel		Description: Subchannel ID associated with VMBUS channel
	Users: Debugging tools and userspace drivers		Users: Debugging tools and userspace drivers

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/monitor_id		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/monitor_id
	Date: January. 2018		Date: January. 2018
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>
	Description: Monitor bit associated with channel		Description: Monitor bit associated with channel
	Users: Debugging tools and userspace drivers		Users: Debugging tools and userspace drivers

	What: /sys/bus/vmbus/devices/vmbus_*/channels/NN/ring		What: /sys/bus/vmbus/devices/<UUID>/channels/<N>/ring
	Date: January. 2018		Date: January. 2018
	KernelVersion: 4.16		KernelVersion: 4.16
	Contact: Stephen Hemminger <sthemmin@microsoft.com>		Contact: Stephen Hemminger <sthemmin@microsoft.com>