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

Commit c4c5551d authored by David S. Miller's avatar David S. Miller
Browse files

Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux 



All conflicts were trivial overlapping changes, so reasonably
easy to resolve.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 40999f11 48e5aee8

Documentation/admin-guide/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -4846,3 +4846,8 @@ 
	xirc2ps_cs=	[NET,PCMCIA]

			Format:

			<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]



	xhci-hcd.quirks		[USB,KNL]

			A hex value specifying bitmask with supplemental xhci

			host controller quirks. Meaning of each bit can be

			consulted in header drivers/usb/host/xhci.h.

Documentation/device-mapper/writecache.txt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ Constructor parameters: 
   size)

5. the number of optional parameters (the parameters with an argument

   count as two)

	start_sector n		(default: 0)

		offset from the start of cache device in 512-byte sectors

	high_watermark n	(default: 50)

		start writeback when the number of used blocks reach this

		watermark

Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ Required root node properties: 
	- "insignal,arndale-octa" - for Exynos5420-based Insignal Arndale

				    Octa board.

	- "insignal,origen"       - for Exynos4210-based Insignal Origen board.

	- "insignal,origen4412    - for Exynos4412-based Insignal Origen board.

	- "insignal,origen4412"   - for Exynos4412-based Insignal Origen board.





Optional nodes:

Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Optional nodes: 


 - port/ports: to describe a connection to an external encoder. The

   binding follows Documentation/devicetree/bindings/graph.txt and

   suppors a single port with a single endpoint.

   supports a single port with a single endpoint.



 - See also Documentation/devicetree/bindings/display/tilcdc/panel.txt and

   Documentation/devicetree/bindings/display/tilcdc/tfp410.txt for connecting

Documentation/devicetree/bindings/gpio/nintendo,hollywood-gpio.txt

+1 −1
Original line number Diff line number Diff line 
Nintendo Wii (Hollywood) GPIO controller



Required properties:

- compatible: "nintendo,hollywood-gpio

- compatible: "nintendo,hollywood-gpio"

- reg: Physical base address and length of the controller's registers.

- gpio-controller: Marks the device node as a GPIO controller.

- #gpio-cells: Should be <2>. The first cell is the pin number and the