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

Commit 3357b0d3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/mpx/prep' into x86/asm 



Pick up some of the MPX commits that modify the syscall entry code,
to have a common base and to reduce conflicts.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 82c62fa0 e27c310a

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/core-api/kernel-api.rst

+0 −14
Original line number Diff line number Diff line
@@ -352,44 +352,30 @@ Read-Copy Update (RCU) 
----------------------



.. kernel-doc:: include/linux/rcupdate.h

   :external:



.. kernel-doc:: include/linux/rcupdate_wait.h

   :external:



.. kernel-doc:: include/linux/rcutree.h

   :external:



.. kernel-doc:: kernel/rcu/tree.c

   :external:



.. kernel-doc:: kernel/rcu/tree_plugin.h

   :external:



.. kernel-doc:: kernel/rcu/tree_exp.h

   :external:



.. kernel-doc:: kernel/rcu/update.c

   :external:



.. kernel-doc:: include/linux/srcu.h

   :external:



.. kernel-doc:: kernel/rcu/srcutree.c

   :external:



.. kernel-doc:: include/linux/rculist_bl.h

   :external:



.. kernel-doc:: include/linux/rculist.h

   :external:



.. kernel-doc:: include/linux/rculist_nulls.h

   :external:



.. kernel-doc:: include/linux/rcu_sync.h

   :external:



.. kernel-doc:: kernel/rcu/sync.c

   :external:

Documentation/devicetree/bindings/iio/proximity/as3935.txt

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ Optional properties: 
	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	  value 0 - 120pF. This will require using the calibration data from

	  the manufacturer.

	- ams,nflwdth: Set the noise and watchdog threshold register on

	  startup. This will need to set according to the noise from the

	  MCU board, and possibly the local environment. Refer to the

	  datasheet for the threshold settings.



Example:
@@ -27,4 +31,5 @@ as3935@0 { 
	interrupt-parent = <&gpio1>;

	interrupts = <16 1>;

	ams,tuning-capacitor-pf = <80>;

	ams,nflwdth = <0x44>;

};

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ Examples: 
			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

			reg = <0x0 0x2c200000 0 0x20000>;

		};

	};
@@ -124,14 +124,14 @@ Examples: 
			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c200000 0 0x200000>;

			reg = <0x0 0x2c200000 0 0x20000>;

		};



		gic-its@2c400000 {

			compatible = "arm,gic-v3-its";

			msi-controller;

			#msi-cells = <1>;

			reg = <0x0 0x2c400000 0 0x200000>;

			reg = <0x0 0x2c400000 0 0x20000>;

		};



		ppi-partitions {