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

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

Merge 3.17-rc5 into staging-next. 



This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents ea521dbc 9e82bf01

Documentation/SubmittingPatches

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ Greg Kroah-Hartman, "How to piss off a kernel subsystem maintainer". 
  <http://www.kroah.com/log/linux/maintainer-03.html>

  <http://www.kroah.com/log/linux/maintainer-04.html>

  <http://www.kroah.com/log/linux/maintainer-05.html>

  <http://www.kroah.com/log/linux/maintainer-06.html>



NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

  <https://lkml.org/lkml/2005/7/11/336>

Documentation/devicetree/bindings/dma/rcar-audmapp.txt

+3 −3
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ Example: 
* DMA client



Required properties:

- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,

		where SRS/DRS values are fixed handles, specified in the SoC

		manual as the value that would be written into the PDMACHCR.

- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.

		where SRS/DRS are specified in the SoC manual.

		It will be written into PDMACHCR as high 16-bit parts.

- dma-names:	a list of DMA channel names, one per "dmas" entry



Example:

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+11 −0
Original line number Diff line number Diff line
@@ -15,6 +15,17 @@ Optional properties for main touchpad device: 
    keycode generated by each GPIO. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

    starting at the LSB. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



    Note: the numbering of the GPIOs and the bit they start at varies between

    maXTouch devices. You must either refer to the documentation, or

    experiment to determine which bit corresponds to which input. Use

    KEY_RESERVED for unused padding values.



Example:



	touch@4b {

Documentation/devicetree/bindings/net/stmmac.txt

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Optional properties: 
  further clocks may be specified in derived bindings.

- clock-names: One name for each entry in the clocks property, the

  first one should be "stmmaceth".

- clk_ptp_ref: this is the PTP reference clock; in case of the PTP is

  available this clock is used for programming the Timestamp Addend Register.

  If not passed then the system clock will be used and this is fine on some

  platforms.



Examples:

Documentation/devicetree/bindings/regulator/tps65090.txt

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ Example: 
		infet5-supply = <&some_reg>;

		infet6-supply = <&some_reg>;

		infet7-supply = <&some_reg>;

		vsys_l1-supply = <&some_reg>;

		vsys_l2-supply = <&some_reg>;

		vsys-l1-supply = <&some_reg>;

		vsys-l2-supply = <&some_reg>;



		regulators {

			dcdc1 {