Merge branch 'linus' into perf/urgent, to synchronize UAPI headers (d6eabce2) · Commits · e / devices / android_kernel_fairphone_FP5

.gitignore

+28 −21

Original line number	Diff line number	Diff line
		@@ -7,38 +7,40 @@
		# command after changing this file, to see if there are
		# any tracked files which get ignored after the change.
		#
		# Normal rules
		# Normal rules (sorted alphabetically)
		#
		.*
		*.a
		*.bin
		*.bz2
		.c.[012].*
		*.dtb
		*.dtb.S
		*.dwo
		*.elf
		*.gcno
		*.gz
		*.i
		*.ko
		*.ll
		*.lst
		*.lz4
		*.lzma
		*.lzo
		*.mod.c
		*.o
		.o.
		*.a
		*.order
		*.patch
		*.s
		*.ko
		*.so
		*.so.dbg
		*.mod.c
		*.i
		*.lst
		*.su
		*.symtypes
		*.order
		*.elf
		*.bin
		*.tar
		*.gz
		*.bz2
		*.lzma
		*.xz
		*.lz4
		*.lzo
		*.patch
		*.gcno
		*.ll
		modules.builtin
		Module.symvers
		*.dwo
		*.su
		.c.[012].*
		modules.builtin

		#
		# Top-level generic files
		@@ -53,6 +55,11 @@ Module.symvers
		/System.map
		/Module.markers

		#
		# RPM spec file (make rpm-pkg)
		#
		/*.spec

		#
		# Debian directory (make deb-pkg)
		#

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ 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)>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jean Tourrilhes <jt@hpl.hp.com>

Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

deleted100644 → 0

+0 −5

Original line number	Diff line number	Diff line
		What: /proc/sys/vm/nr_pdflush_threads
		Date: June 2012
		Contact: Wanpeng Li <liwp@linux.vnet.ibm.com>
		Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush
		exported in /proc/sys/vm/ should be removed.

Documentation/ABI/obsolete/sysfs-gpio

+1 −1

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

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

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

Documentation/ABI/stable/sysfs-bus-vmbus

+70 −0

Original line number	Diff line number	Diff line
		@@ -41,3 +41,73 @@ KernelVersion: 4.5
		Contact: K. Y. Srinivasan <kys@microsoft.com>
		Description: The 16 bit vendor ID of the device
		Users: tools/hv/lsvmbus and user level RDMA libraries

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

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

		What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/in_mask
		Date: September. 2017
		KernelVersion: 4.14
		Contact: Stephen Hemminger <sthemmin@microsoft.com>
		Description: Inbound channel signaling state
		Users: Debugging tools

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

		What: /sys/bus/vmbus/devices/vmbus_*/channels/relid/out_mask
		Date: September. 2017
		KernelVersion: 4.14
		Contact: Stephen Hemminger <sthemmin@microsoft.com>
		Description: Outbound channel signaling state
		Users: Debugging tools

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

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

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

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

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