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

Commit 8f66439e authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'v4.12-rc5' into for-4.13/block 



We've already got a few conflicts and upcoming work depends on some of the
changes that have gone into mainline as regression fixes for this series.

Pull in 4.12-rc5 to resolve these conflicts and make it easier on down stream
trees to continue working on 4.13 changes.

Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parents 22ec656b 32c1431e

Documentation/admin-guide/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -866,6 +866,15 @@ 


	dscc4.setup=	[NET]



	dt_cpu_ftrs=	[PPC]

			Format: {"off" | "known"}

			Control how the dt_cpu_ftrs device-tree binding is

			used for CPU feature discovery and setup (if it

			exists).

			off: Do not use it, fall back to legacy cpu table.

			known: Do not pass through unknown features to guests

			or userspace, only those that the kernel is aware of.



	dump_apple_properties	[X86]

			Dump name and content of EFI device properties on

			x86 Macs.  Useful for driver authors to determine

Documentation/devicetree/bindings/input/touchscreen/edt-ft5x06.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Optional properties: 
                control gpios



 - threshold:   allows setting the "click"-threshold in the range

                from 20 to 80.

                from 0 to 80.



 - gain:        allows setting the sensitivity in the range from 0 to

                31. Note that lower values indicate higher

Documentation/devicetree/bindings/net/dsa/marvell.txt

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ Optional properties: 
- interrupt-controller	: Indicates the switch is itself an interrupt

			  controller. This is used for the PHY interrupts.

#interrupt-cells = <2>	: Controller uses two cells, number and flag

- eeprom-length		: Set to the length of an EEPROM connected to the

			  switch. Must be set if the switch can not detect

			  the presence and/or size of a connected EEPROM,

			  otherwise optional.

- mdio			: Container of PHY and devices on the switches MDIO

			  bus.

- mdio?		: Container of PHYs and devices on the external MDIO

Documentation/devicetree/bindings/net/fsl-fec.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ Optional properties: 
- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

+0 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ bias-bus-hold - latch weakly 
bias-pull-up		- pull up the pin

bias-pull-down		- pull down the pin

bias-pull-pin-default	- use pin-default pull state

bi-directional		- pin supports simultaneous input/output operations

drive-push-pull		- drive actively high and low

drive-open-drain	- drive with open drain

drive-open-source	- drive with open source
@@ -260,7 +259,6 @@ input-debounce - debounce mode with debound time X 
power-source		- select between different power supplies

low-power-enable	- enable low power mode

low-power-disable	- disable low power mode

output-enable		- enable output on pin regardless of output value

output-low		- set the pin to output mode with low level

output-high		- set the pin to output mode with high level

slew-rate		- set the slew rate