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

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

Merge branch 'x86/ras' into ras/core, to pick up changes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6e06780a 7e0abcd6

Documentation/Changes

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ o udev 081 # udevd --version 
o  grub                   0.93                    # grub --version || grub-install --version

o  grub                   0.93                    # grub --version || grub-install --version

o  mcelog                 0.6                     # mcelog --version

o  mcelog                 0.6                     # mcelog --version

o  iptables               1.4.2                   # iptables -V

o  iptables               1.4.2                   # iptables -V

o  openssl & libcrypto    1.0.1k                  # openssl version

o  openssl & libcrypto    1.0.0                   # openssl version









Kernel compilation

Kernel compilation

Documentation/device-mapper/snapshot.txt

+7 −3
Original line number Original line Diff line number Diff line
@@ -41,9 +41,13 @@ useless and be disabled, returning errors. So it is important to monitor 
the amount of free space and expand the <COW device> before it fills up.

the amount of free space and expand the <COW device> before it fills up.





<persistent?> is P (Persistent) or N (Not persistent - will not survive

<persistent?> is P (Persistent) or N (Not persistent - will not survive

after reboot).

after reboot).  O (Overflow) can be added as a persistent store option

The difference is that for transient snapshots less metadata must be

to allow userspace to advertise its support for seeing "Overflow" in the

saved on disk - they can be kept in memory by the kernel.

snapshot status.  So supported store types are "P", "PO" and "N".



The difference between persistent and transient is with transient

snapshots less metadata must be saved on disk - they can be kept in

memory by the kernel.









* snapshot-merge <origin> <COW device> <persistent> <chunksize>

* snapshot-merge <origin> <COW device> <persistent> <chunksize>

Documentation/devicetree/bindings/input/cypress,cyapa.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ Example: 
		/* Cypress Gen3 touchpad */

		/* Cypress Gen3 touchpad */

		touchpad@67 {

		touchpad@67 {

			compatible = "cypress,cyapa";

			compatible = "cypress,cyapa";

			reg = <0x24>;

			reg = <0x67>;

			interrupt-parent = <&gpio>;

			interrupt-parent = <&gpio>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;	/* GPIO 2 */

			wakeup-source;

			wakeup-source;

Documentation/devicetree/bindings/spi/sh-msiof.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -51,7 +51,7 @@ Optional properties, deprecated for soctype-specific bindings: 
- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

- renesas,tx-fifo-size : Overrides the default tx fifo size given in words

			 (default is 64)

			 (default is 64)

- renesas,rx-fifo-size : Overrides the default rx fifo size given in words

- renesas,rx-fifo-size : Overrides the default rx fifo size given in words

			 (default is 64, or 256 on R-Car Gen2)

			 (default is 64)





Pinctrl properties might be needed, too.  See

Pinctrl properties might be needed, too.  See

Documentation/devicetree/bindings/pinctrl/renesas,*.

Documentation/devicetree/bindings/pinctrl/renesas,*.

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7790"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7791"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7794"

	- "renesas,usbhs-r8a7795"

  - reg: Base address and length of the register for the USBHS

  - reg: Base address and length of the register for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - interrupts: Interrupt specifier for the USBHS

  - clocks: A list of phandle + clock specifier pairs

  - clocks: A list of phandle + clock specifier pairs