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

Commit 0520d37b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.14-rc6 into usb-next 



We need the USB fixes in here as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 8dd8d2c9 bb176f67

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/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 {

Documentation/process/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ Below are the essential guides that every developer should read. 
   submitting-patches

   coding-style

   email-clients

   kernel-enforcement-statement



Other guides to the community that are of interest to most developers are: