Commit 37acd687 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.18/hid-steam' into for-linus 

Valve Steam Controller support from Rodrigo Rivas Costa
parents 79b83b05 4b64487f

Documentation/bpf/bpf_devel_QA.txt

+9 −1
Original line number Diff line number Diff line
@@ -557,6 +557,14 @@ A: Although LLVM IR generation and optimization try to stay architecture 
       pulls in some header files containing file scope host assembly codes.

     - You can add "-fno-jump-tables" to work around the switch table issue.



   Otherwise, you can use bpf target.

   Otherwise, you can use bpf target. Additionally, you _must_ use bpf target

   when:



     - Your program uses data structures with pointer or long / unsigned long

       types that interface with BPF helpers or context data structures. Access

       into these structures is verified by the BPF verifier and may result

       in verification failures if the native architecture is not aligned with

       the BPF architecture, e.g. 64-bit. An example of this is

       BPF_PROG_TYPE_SK_MSG require '-target bpf'



Happy BPF hacking!

Documentation/core-api/kernel-api.rst

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,19 @@ Sorting 
.. kernel-doc:: lib/list_sort.c

   :export:



Text Searching

--------------



.. kernel-doc:: lib/textsearch.c

   :doc: ts_intro



.. kernel-doc:: lib/textsearch.c

   :export:



.. kernel-doc:: include/linux/textsearch.h

   :functions: textsearch_find textsearch_next \

               textsearch_get_pattern textsearch_get_pattern_len



UUID/GUID

---------

Documentation/devicetree/bindings/ata/ahci-platform.txt

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ compatible: 
Optional properties:

- dma-coherent      : Present if dma operations are coherent

- clocks            : a list of phandle + clock specifier pairs

- resets            : a list of phandle + reset specifier pairs

- target-supply     : regulator for SATA target power

- phys              : reference to the SATA PHY node

- phy-names         : must be "sata-phy"

Documentation/devicetree/bindings/display/panel/panel-common.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ Display Timings 
  require specific display timings. The panel-timing subnode expresses those

  timings as specified in the timing subnode section of the display timing

  bindings defined in

  Documentation/devicetree/bindings/display/display-timing.txt.

  Documentation/devicetree/bindings/display/panel/display-timing.txt.





Connectivity

Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ Required Properties: 
		- "renesas,dmac-r8a7794" (R-Car E2)

		- "renesas,dmac-r8a7795" (R-Car H3)

		- "renesas,dmac-r8a7796" (R-Car M3-W)

		- "renesas,dmac-r8a77965" (R-Car M3-N)

		- "renesas,dmac-r8a77970" (R-Car V3M)

		- "renesas,dmac-r8a77980" (R-Car V3H)