Commit cc1c8445 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge tag 'v4.17-rc4' into rpmsg-next 



Pick up fixes from rproc-v4.17-1

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parents ab460a2e 75bc37fe

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/input/atmel,maxtouch.txt

+7 −0
Original line number Diff line number Diff line
@@ -4,6 +4,13 @@ Required properties: 
- compatible:

    atmel,maxtouch



    The following compatibles have been used in various products but are

    deprecated:

	atmel,qt602240_ts

	atmel,atmel_mxt_ts

	atmel,atmel_mxt_tp

	atmel,mXT224



- reg: The I2C address of the device



- interrupts: The sink for the touchpad's IRQ output

Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ Required properties: 
- interrupts : identifier to the device interrupt

- clocks : a list of phandle + clock-specifier pairs, one for each

	   entry in clock names.

- clocks-names :

- clock-names :

   * "xtal" for external xtal clock identifier

   * "pclk" for the bus core clock, either the clk81 clock or the gate clock

   * "baud" for the source of the baudrate generator, can be either the xtal

Documentation/devicetree/bindings/serial/mvebu-uart.txt

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Required properties: 
    - Must contain two elements for the extended variant of the IP

      (marvell,armada-3700-uart-ext): "uart-tx" and "uart-rx",

      respectively the UART TX interrupt and the UART RX interrupt. A

      corresponding interrupts-names property must be defined.

      corresponding interrupt-names property must be defined.

    - For backward compatibility reasons, a single element interrupts

      property is also supported for the standard variant of the IP,

      containing only the UART sum interrupt. This form is deprecated