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

Commit 336879b1 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge remote-tracking branch 'airlied/drm-next' into topic/vblank-rework 



Dave asked me to do the backmerge before sending him the revised pull
request, so here we go. Nothing fancy in the conflicts, just a few
things changed right next to each another.

Conflicts:
	drivers/gpu/drm/drm_irq.c

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
parents 3d3cbd84 fdcaa1db

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
*.gcno

modules.builtin

Module.symvers

*.dwo



#

# Top-level generic files

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -1381,6 +1381,9 @@ S: 17 rue Danton 
S: F - 94270 Le Kremlin-Bicêtre

S: France



N: Jack Hammer

D: IBM ServeRAID RAID (ips) driver maintenance



N: Greg Hankins

E: gregh@cc.gatech.edu

D: fixed keyboard driver to separate LED and locking status
@@ -1691,6 +1694,10 @@ S: Reading 
S: RG6 2NU

S: United Kingdom



N: Dave Jeffery

E: dhjeffery@gmail.com

D: SCSI hacks and IBM ServeRAID RAID driver maintenance



N: Jakub Jelinek

E: jakub@redhat.com

W: http://sunsite.mff.cuni.cz/~jj

Documentation/ABI/stable/sysfs-bus-usb

+7 −7
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ Date: May 2007 
KernelVersion:	2.6.23

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		If CONFIG_USB_PERSIST is set, then each USB device directory

		will contain a file named power/persist.  The file holds a

		boolean value (0 or 1) indicating whether or not the

		"USB-Persist" facility is enabled for the device.  Since the

		facility is inherently dangerous, it is disabled by default

		for all devices except hubs.  For more information, see

		Documentation/usb/persist.txt.

		USB device directories can contain a file named power/persist.

		The file holds a boolean value (0 or 1) indicating whether or

		not the "USB-Persist" facility is enabled for the device.  For

		hubs this facility is always enabled and their device

		directories will not contain this file.



		For more information, see Documentation/usb/persist.txt.



What:		/sys/bus/usb/devices/.../power/autosuspend

Date:		March 2007

Documentation/ABI/testing/ima_policy

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Description: 
			option:	[[appraise_type=]] [permit_directio]



		base: 	func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]

				[FIRMWARE_CHECK]

			mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

			fsmagic:= hex value

			fsuuid:= file system UUID (e.g 8bcbe394-4f13-4144-be8e-5aa9ea2ce2f6)
@@ -57,7 +58,8 @@ Description: 
			measure func=BPRM_CHECK

			measure func=FILE_MMAP mask=MAY_EXEC

			measure func=FILE_CHECK mask=MAY_READ uid=0

			measure func=MODULE_CHECK uid=0

			measure func=MODULE_CHECK

			measure func=FIRMWARE_CHECK

			appraise fowner=0



		The default policy measures all executables in bprm_check,

Documentation/ABI/testing/sysfs-bus-iio

+95 −0
Original line number Diff line number Diff line
@@ -260,6 +260,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_magn_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_magn_y_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_magn_z_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_pressure_scale

KernelVersion:	2.6.35
@@ -447,6 +451,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_thresh_rising_en 
What:		/sys/.../iio:deviceX/events/in_magn_y_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_magn_z_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_magn_z_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_supply_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_voltageY_supply_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_rising_en
@@ -492,6 +504,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_roc_rising_en 
What:		/sys/.../iio:deviceX/events/in_magn_y_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_magn_z_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_magn_z_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_magnetic_tilt_comp_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_rot_from_north_true_tilt_comp_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_supply_roc_rising_en

What:		/sys/.../iio:deviceX/events/in_voltageY_supply_roc_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_roc_rising_en
@@ -538,6 +558,14 @@ What: /sys/.../events/in_magn_y_raw_thresh_rising_value 
What:		/sys/.../events/in_magn_y_raw_thresh_falling_value

What:		/sys/.../events/in_magn_z_raw_thresh_rising_value

What:		/sys/.../events/in_magn_z_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_true_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_true_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_raw_thresh_rising_value
@@ -588,6 +616,18 @@ What: /sys/.../events/in_magn_y_thresh_either_hysteresis 
What:		/sys/.../events/in_magn_z_thresh_rising_hysteresis

What:		/sys/.../events/in_magn_z_thresh_falling_hysteresis

What:		/sys/.../events/in_magn_z_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_either_hysteresis

What:		/sys/.../events/in_voltageY_thresh_rising_hysteresis

What:		/sys/.../events/in_voltageY_thresh_falling_hysteresis

What:		/sys/.../events/in_voltageY_thresh_either_hysteresis
@@ -635,6 +675,14 @@ What: /sys/.../events/in_magn_y_raw_roc_rising_value 
What:		/sys/.../events/in_magn_y_raw_roc_falling_value

What:		/sys/.../events/in_magn_z_raw_roc_rising_value

What:		/sys/.../events/in_magn_z_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_true_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_true_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_raw_roc_rising_value
@@ -690,6 +738,22 @@ What: /sys/.../events/in_magn_z_thresh_rising_period 
What:		/sys/.../events/in_magn_z_thresh_falling_period

What:		/sys/.../events/in_magn_z_roc_rising_period

What:		/sys/.../events/in_magn_z_roc_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_roc_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_roc_falling_period

What:		/sys/.../events/in_rot_from_north_true_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_true_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_true_roc_rising_period

What:		/sys/.../events/in_rot_from_north_true_roc_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_falling_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_roc_rising_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_roc_falling_period

What:		/sys/.../events/in_voltageY_supply_thresh_rising_period

What:		/sys/.../events/in_voltageY_supply_thresh_falling_period

What:		/sys/.../events/in_voltageY_supply_roc_rising_period
@@ -787,6 +851,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en 
What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_en
@@ -853,6 +921,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index 
What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index
@@ -895,6 +967,19 @@ Description: 
		on-chip EEPROM. After power-up or chip reset the device will

		automatically load the saved configuration.



What:		/sys/.../iio:deviceX/in_proximity_raw

What:		/sys/.../iio:deviceX/in_proximity_input

What:		/sys/.../iio:deviceX/in_proximityY_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Proximity measurement indicating that some

		object is near the sensor, usually be observing

		reflectivity of infrared or ultrasound emitted.

		Often these sensors are unit less and as such conversion

		to SI units is not possible.  Where it is, the units should

		be meters.



What:		/sys/.../iio:deviceX/in_illuminanceY_input

What:		/sys/.../iio:deviceX/in_illuminanceY_raw

What:		/sys/.../iio:deviceX/in_illuminanceY_mean_raw
@@ -933,3 +1018,13 @@ Description: 
		x y z w. Here x, y, and z component represents the axis about

		which a rotation will occur and w component represents the

		amount of rotation.



What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_tilt_comp_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_tilt_comp_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_magnetic_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_rot_from_north_true_raw

KernelVersion:	3.15

Contact:	linux-iio@vger.kernel.org

Description:

		Raw value of rotation from true/magnetic north measured with

		or without compensation from tilt sensors.