Commit 134933e5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'v4.16-rc6' into perf/core, to pick up fixes



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 24868367 c698ca52
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD:
  Associate an event fd to an AFU interrupt so that the user process
  can be notified when the AFU sends an interrupt.

OCXL_IOCTL_GET_METADATA:

  Obtains configuration information from the card, such at the size of
  MMIO areas, the AFU version, and the PASID for the current context.


mmap
----
+5 −1
Original line number Diff line number Diff line
@@ -11,7 +11,11 @@ Required properties:
  interrupts.

Optional properties:
- clocks: Optional reference to the clock used by the XOR engine.
- clocks: Optional reference to the clocks used by the XOR engine.
- clock-names: mandatory if there is a second clock, in this case the
   name must be "core" for the first clock and "reg" for the second
   one


Example:

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ Required properties:
      - "renesas,etheravb-r8a7795" for the R8A7795 SoC.
      - "renesas,etheravb-r8a7796" for the R8A7796 SoC.
      - "renesas,etheravb-r8a77970" for the R8A77970 SoC.
      - "renesas,etheravb-r8a77980" for the R8A77980 SoC.
      - "renesas,etheravb-r8a77995" for the R8A77995 SoC.
      - "renesas,etheravb-rcar-gen3" as a fallback for the above
		R-Car Gen3 devices.
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Required properties:
  configured in FS mode;
  - "st,stm32f4x9-hsotg": The DWC2 USB HS controller instance in STM32F4x9 SoCs
  configured in HS mode;
  - "st,stm32f7xx-hsotg": The DWC2 USB HS controller instance in STM32F7xx SoCs
  - "st,stm32f7-hsotg": The DWC2 USB HS controller instance in STM32F7 SoCs
    configured in HS mode;
- reg : Should contain 1 register range (address and length)
- interrupts : Should contain 1 interrupt
+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties:
  - compatible: Must contain one of the following:
	- "renesas,r8a7795-usb3-peri"
	- "renesas,r8a7796-usb3-peri"
	- "renesas,r8a77965-usb3-peri"
	- "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 compatible
	  device

Loading