Merge tag 'v4.14-rc6' into next (91de76e6) · Commits · e / devices / android_kernel_oneplus_sm7250

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Ketrenos <jketreno@io.(none)>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

+4 −6

Original line number	Diff line number	Diff line
		@@ -2090,7 +2090,7 @@ S: Kuala Lumpur, Malaysia

		N: Mohit Kumar
		D: ST Microelectronics SPEAr13xx PCI host bridge driver
		D: Synopsys Designware PCI host bridge driver
		D: Synopsys DesignWare PCI host bridge driver

		N: Gabor Kuti
		E: seasons@falcon.sch.bme.hu
		@@ -2606,11 +2606,9 @@ E: tmolina@cablespeed.com
		D: bug fixes, documentation, minor hackery

		N: Paul Moore
		E: paul.moore@hp.com
		D: NetLabel author
		S: Hewlett-Packard
		S: 110 Spit Brook Road
		S: Nashua, NH 03062
		E: paul@paul-moore.com
		W: http://www.paul-moore.com
		D: NetLabel, SELinux, audit

		N: James Morris
		E: jmorris@namei.org

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/nvmem/devices/.../nvmem
		Date: July 2015
		KernelVersion: 4.2
		Contact: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
		Description:
		This file allows user to read/write the raw NVMEM contents.
		Permissions for write to this file depends on the nvmem
		provider configuration.

		ex:
		hexdump /sys/bus/nvmem/devices/qfprom0/nvmem

		0000000 0000 0000 0000 0000 0000 0000 0000 0000
		*
		00000a0 db10 2240 0000 e000 0c00 0c00 0000 0c00
		0000000 0000 0000 0000 0000 0000 0000 0000 0000
		...
		*
		0001000

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/cap
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Capabilities the DMA supports.Currently there are DMA_PQ, DMA_PQ_VAL,
		DMA_XOR,DMA_XOR_VAL,DMA_INTERRUPT.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_active
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: The number of descriptors active in the ring.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/ring_size
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Descriptor ring size, total number of descriptors available.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/version
		Date: December 3, 2009
		KernelVersion: 2.6.32
		Contact: dmaengine@vger.kernel.org
		Description: Version of ioatdma device.

		What: sys/devices/pciXXXX:XX/0000:XX:XX.X/dma/dma<n>chan<n>/quickdata/intr_coalesce
		Date: August 8, 2017
		KernelVersion: 4.14
		Contact: dmaengine@vger.kernel.org
		Description: Tune-able interrupt delay value per channel basis.

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,3 +12,6 @@ Description:
		Ethernet over USB link
		dev_addr - MAC address of device's end of this
		Ethernet over USB link
		class - USB interface class, default is 02 (hex)
		subclass - USB interface subclass, default is 06 (hex)
		protocol - USB interface protocol, default is 00 (hex)