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

Commit 1bc3cd4d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into sched/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8887cd99 94a6df25

Documentation/devicetree/bindings/gpio/gpio-mvebu.txt

+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@ Required properties: 
Optional properties:



In order to use the GPIO lines in PWM mode, some additional optional

properties are required. Only Armada 370 and XP support these properties.

properties are required.



- compatible: Must contain "marvell,armada-370-xp-gpio"

- compatible: Must contain "marvell,armada-370-gpio"



- reg: an additional register set is needed, for the GPIO Blink

  Counter on/off registers.
@@ -71,7 +71,7 @@ Example: 
		};



		gpio1: gpio@18140 {

			compatible = "marvell,armada-370-xp-gpio";

			compatible = "marvell,armada-370-gpio";

			reg = <0x18140 0x40>, <0x181c8 0x08>;

			reg-names = "gpio", "pwm";

			ngpios = <17>;

Documentation/devicetree/bindings/mfd/stm32-timers.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Example: 
		compatible = "st,stm32-timers";

		reg = <0x40010000 0x400>;

		clocks = <&rcc 0 160>;

		clock-names = "clk_int";

		clock-names = "int";



		pwm {

			compatible = "st,stm32-pwm";

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:

arch/mips/kvm/tlb.c

+5 −1
Original line number Diff line number Diff line
@@ -166,7 +166,11 @@ static int _kvm_mips_host_tlb_inv(unsigned long entryhi) 
int kvm_mips_host_tlb_inv(struct kvm_vcpu *vcpu, unsigned long va,

			  bool user, bool kernel)

{

	int idx_user, idx_kernel;

	/*

	 * Initialize idx_user and idx_kernel to workaround bogus

	 * maybe-initialized warning when using GCC 6.

	 */

	int idx_user = 0, idx_kernel = 0;

	unsigned long flags, old_entryhi;



	local_irq_save(flags);