Merge tag 'v4.10-rc6' into devel (7f36f5d1) · Commits · e / devices / android_kernel_teracube_emerald

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
		Rudolf Marek <R.Marek@sh.cvut.cz>
		Rui Saraiva <rmps@joel.ist.utl.pt>
		Sachin P Sant <ssant@in.ibm.com>
		Sarangdhar Joshi <spjoshi@codeaurora.org>
		Sam Ravnborg <sam@mars.ravnborg.org>
		Santosh Shilimkar <ssantosh@kernel.org>
		Santosh Shilimkar <santosh.shilimkar@oracle.org>
		@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
		Simon Kelley <simon@thekelleys.org.uk>
		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
		Stephen Hemminger <shemminger@osdl.org>
		Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
		Subhash Jadavani <subhashj@codeaurora.org>
		Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
		Sumit Semwal <sumit.semwal@ti.com>
		Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Thomas Pedersen <twp@codeaurora.org>
		Tony Luck <tony.luck@intel.com>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		What: /sys/devices/.../deferred_probe
		Date: August 2016
		Contact: Ben Hutchings <ben.hutchings@codethink.co.uk>
		Description:
		The /sys/devices/.../deferred_probe attribute is
		present for all devices. If a driver detects during
		probing a device that a related device is not yet
		ready, it may defer probing of the first device. The
		kernel will retry probing the first device after any
		other device is successfully probed. This attribute
		reads as 1 if probing of this device is currently
		deferred, or 0 otherwise.

+12 −1

Original line number	Diff line number	Diff line
		@@ -106,6 +106,16 @@
		use by PCI
		Format: <irq>,<irq>...

		acpi_mask_gpe= [HW,ACPI]
		Due to the existence of _Lxx/_Exx, some GPEs triggered
		by unsupported hardware/firmware features can result in
		GPE floodings that cannot be automatically disabled by
		the GPE dispatcher.
		This facility can be used to prevent such uncontrolled
		GPE floodings.
		Format: <int>
		Support masking of GPEs numbered from 0x00 to 0x7f.

		acpi_no_auto_serialize [HW,ACPI]
		Disable auto-serialization of AML methods
		AML control methods that contain the opcodes to create
		@@ -3811,10 +3821,11 @@
		it if 0 is given (See Documentation/cgroup-v1/memory.txt)

		swiotlb= [ARM,IA-64,PPC,MIPS,X86]
		Format: { <int> \| force }
		Format: { <int> \| force \| noforce }
		<int> -- Number of I/O TLB slabs
		force -- force using of bounce buffers even if they
		wouldn't be automatically used by the kernel
		noforce -- Never use bounce buffers (for debugging)

		switches= [HW,M68k]

+3 −3

Original line number	Diff line number	Diff line
		@@ -54,9 +54,9 @@ This is the hardware sector size of the device, in bytes.

		io_poll (RW)
		------------
		When read, this file shows the total number of block IO polls and how
		many returned success. Writing '0' to this file will disable polling
		for this device. Writing any non-zero value will enable this feature.
		When read, this file shows whether polling is enabled (1) or disabled
		(0). Writing '0' to this file will disable polling for this device.
		Writing any non-zero value will enable this feature.

		io_poll_delay (RW)
		------------------

+8 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ wants to support one of the below features, it should adapt the bindings below.
		"irq" and "wakeup" names are recognized by I2C core, other names are
		left to individual drivers.

		- host-notify
		device uses SMBus host notify protocol instead of interrupt line.

		- multi-master
		states that there is another master active on this bus. The OS can use
		this information to adapt power management to keep the arbitration awake
		@@ -81,6 +84,11 @@ Binding may contain optional "interrupts" property, describing interrupts
		used by the device. I2C core will assign "irq" interrupt (or the very first
		interrupt if not using interrupt names) as primary interrupt for the slave.

		Alternatively, devices supporting SMbus Host Notify, and connected to
		adapters that support this feature, may use "host-notify" property. I2C
		core will create a virtual interrupt for Host Notify and assign it as
		primary interrupt for the slave.

		Also, if device is marked as a wakeup source, I2C core will set up "wakeup"
		interrupt for the device. If "wakeup" interrupt name is not present in the
		binding, then primary interrupt will be used as wakeup interrupt.