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

Commit a4eb8b99 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/mm, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 26179670 8d829b9b

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -3811,6 +3811,13 @@ 
			expediting.  Set to zero to disable automatic

			expediting.



	stack_guard_gap=	[MM]

			override the default stack gap protection. The value

			is in page units and it defines how many pages prior

			to (for stacks growing down) resp. after (for stacks

			growing up) the main stack are reserved for no other

			mapping. Default value is 256 pages.



	stacktrace	[FTRACE]

			Enabled the stack tracer on boot up.

Documentation/devicetree/bindings/clock/sunxi-ccu.txt

+4 −3
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ Required properties : 
- #clock-cells : must contain 1

- #reset-cells : must contain 1



For the PRCM CCUs on H3/A64, one more clock is needed:

For the PRCM CCUs on H3/A64, two more clocks are needed:

- "pll-periph": the SoC's peripheral PLL from the main CCU

- "iosc": the SoC's internal frequency oscillator



Example for generic CCU:
@@ -39,8 +40,8 @@ Example for PRCM CCU: 
r_ccu: clock@01f01400 {

	compatible = "allwinner,sun50i-a64-r-ccu";

	reg = <0x01f01400 0x100>;

	clocks = <&osc24M>, <&osc32k>, <&iosc>;

	clock-names = "hosc", "losc", "iosc";

	clocks = <&osc24M>, <&osc32k>, <&iosc>, <&ccu CLK_PLL_PERIPH0>;

	clock-names = "hosc", "losc", "iosc", "pll-periph";

	#clock-cells = <1>;

	#reset-cells = <1>;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ Required properties: 
      "brcm,bcm6328-switch"

      "brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch"



See Documentation/devicetree/bindings/dsa/dsa.txt for a list of additional

See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional

required and optional properties.



Examples:

Documentation/devicetree/bindings/net/smsc911x.txt

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Optional properties: 
  of the device. On many systems this is wired high so the device goes

  out of reset at power-on, but if it is under program control, this

  optional GPIO can wake up in response to it.

- vdd33a-supply, vddvario-supply : 3.3V analog and IO logic power supplies



Examples:

Documentation/devicetree/bindings/usb/dwc2.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

  - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;

  - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;

  - "amlogic,meson8-usb": The DWC2 USB controller instance in Amlogic Meson8 SoCs;

  - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;

  - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;

  - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;