Commit 9334030c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/urgent 



To check if more kernel API sync is needed and also to see if the perf
build tests continue to pass.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents fc45e658 90c9e950

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org> 
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>

Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>

Christian Brauner <brauner@kernel.org> <christian@brauner.io>

Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>

Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>

Documentation/arm64/silicon-errata.rst

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A510     | #2051678        | ARM64_ERRATUM_2051678       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A510     | #2077057        | ARM64_ERRATUM_2077057       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2119858        | ARM64_ERRATUM_2119858       |

+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A710     | #2054223        | ARM64_ERRATUM_2054223       |

Documentation/dev-tools/kselftest.rst

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code 
paths in the kernel. Tests are intended to be run after building, installing

and booting a kernel.



Kselftest from mainline can be run on older stable kernels. Running tests

from mainline offers the best coverage. Several test rings run mainline

kselftest suite on stable releases. The reason is that when a new test

gets added to test existing code to regression test a bug, we should be

able to run that test on an older kernel. Hence, it is important to keep

code that can still test an older kernel and make sure it skips the test

gracefully on newer releases.



You can find additional information on Kselftest framework, how to

write new tests using the framework on Kselftest wiki:

Documentation/devicetree/bindings/net/qcom,ipa.yaml

+6 −0
Original line number Diff line number Diff line
@@ -107,6 +107,10 @@ properties: 
          - const: imem

          - const: config



  qcom,qmp:

    $ref: /schemas/types.yaml#/definitions/phandle

    description: phandle to the AOSS side-channel message RAM



  qcom,smem-states:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description: State bits used in by the AP to signal the modem.
@@ -222,6 +226,8 @@ examples: 
                                     "imem",

                                     "config";



                qcom,qmp = <&aoss_qmp>;



                qcom,smem-states = <&ipa_smp2p_out 0>,

                                   <&ipa_smp2p_out 1>;

                qcom,smem-state-names = "ipa-clock-enabled-valid",

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ properties: 
    minItems: 1

    maxItems: 256

    items:

      minimum: 0

      items:

        - minimum: 0

          maximum: 256

    description:

      Chip select used by the device.