Merge branch 'for-4.15/alps' into for-linus (5cc619db) · 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>

CREDITS

+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

Documentation/ABI/stable/sysfs-driver-dma-ioatdma

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.

Documentation/ABI/testing/ppc-memtrace

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/debug/powerpc/memtrace
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: This folder contains the relevant debugfs files for the
		hardware trace macro to use. CONFIG_PPC64_HARDWARE_TRACING
		must be set.

		What: /sys/kernel/debug/powerpc/memtrace/enable
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: Write an integer containing the size in bytes of the memory
		you want removed from each NUMA node to this file - it must be
		aligned to the memblock size. This amount of RAM will be removed
		from the kernel mappings and the following debugfs files will be
		created. This can only be successfully done once per boot. Once
		memory is successfully removed from each node, the following
		files are created.

		What: /sys/kernel/debug/powerpc/memtrace/<node-id>
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: This directory contains information about the removed memory
		from the specific NUMA node.

		What: /sys/kernel/debug/powerpc/memtrace/<node-id>/size
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: This contains the size of the memory removed from the node.

		What: /sys/kernel/debug/powerpc/memtrace/<node-id>/start
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: This contains the start address of the removed memory.

		What: /sys/kernel/debug/powerpc/memtrace/<node-id>/trace
		Date: Aug 2017
		KernelVersion: 4.14
		Contact: linuxppc-dev@lists.ozlabs.org
		Description: This is where the hardware trace macro will output the trace
		it generates.

Documentation/ABI/testing/procfs-smaps_rollup

0 → 100644

+31 −0

Original line number	Diff line number	Diff line
		What: /proc/pid/smaps_rollup
		Date: August 2017
		Contact: Daniel Colascione <dancol@google.com>
		Description:
		This file provides pre-summed memory information for a
		process. The format is identical to /proc/pid/smaps,
		except instead of an entry for each VMA in a process,
		smaps_rollup has a single entry (tagged "[rollup]")
		for which each field is the sum of the corresponding
		fields from all the maps in /proc/pid/smaps.
		For more details, see the procfs man page.

		Typical output looks like this:

		00100000-ff709000 ---p 00000000 00:00 0 [rollup]
		Rss: 884 kB
		Pss: 385 kB
		Shared_Clean: 696 kB
		Shared_Dirty: 0 kB
		Private_Clean: 120 kB
		Private_Dirty: 68 kB
		Referenced: 884 kB
		Anonymous: 68 kB
		LazyFree: 0 kB
		AnonHugePages: 0 kB
		ShmemPmdMapped: 0 kB
		Shared_Hugetlb: 0 kB
		Private_Hugetlb: 0 kB
		Swap: 0 kB
		SwapPss: 0 kB
		Locked: 385 kB