Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a88cbd8 authored Nov 02, 2017 by Dave Airlie

Backmerge tag 'v4.14-rc7' into drm-next

Linux 4.14-rc7

Requested by Ben Skeggs for nouveau to avoid major conflicts,
and things were getting a bit conflicty already, esp around amdgpu
reverts.

parents 0a4334c9 0b07194b

.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>

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,3 +14,11 @@ Description:
		Show or set the gain boost of the amp, from 0-31 range.
		18 = indoors (default)
		14 = outdoors

		What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
		Date: May 2017
		KernelVersion: 4.13
		Contact: Matt Ranostay <matt.ranostay@konsulko.com>
		Description:
		When 1 the noise level is over the trip level and not reporting
		valid data

Documentation/ABI/testing/sysfs-devices-power

+3 −1

Original line number	Diff line number	Diff line
		@@ -211,7 +211,9 @@ Description:
		device, after it has been suspended at run time, from a resume
		request to the moment the device will be ready to process I/O,
		in microseconds. If it is equal to 0, however, this means that
		the PM QoS resume latency may be arbitrary.
		the PM QoS resume latency may be arbitrary and the special value
		"n/a" means that user space cannot accept any resume latency at
		all for the given device.

		Not all drivers support this attribute. If it isn't supported,
		it is not present.

Documentation/ABI/testing/sysfs-kernel-mm-swap

+0 −10

Original line number	Diff line number	Diff line
		@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
		still used for tmpfs etc. other users. If set to
		false, the global swap readahead algorithm will be
		used for all swappable pages.

		What: /sys/kernel/mm/swap/vma_ra_max_order
		Date: August 2017
		Contact: Linux memory management mailing list <linux-mm@kvack.org>
		Description: The max readahead size in order for VMA based swap readahead

		VMA based swap readahead algorithm will readahead at
		most 1 << max_order pages for each readahead. The
		real readahead size for each readahead will be scaled
		according to the estimation algorithm.

Documentation/ABI/testing/sysfs-power

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ Description:

		What; /sys/power/pm_trace_dev_match
		Date: October 2010
		Contact: James Hogan <james@albanarts.com>
		Contact: James Hogan <jhogan@kernel.org>
		Description:
		The /sys/power/pm_trace_dev_match file contains the name of the
		device associated with the last PM event point saved in the RTC