Commit c59400a6 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



No conflicts.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9c309189 dcb85f85

.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/admin-guide/gpio/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ gpio 
    gpio-aggregator

    sysfs

    gpio-mockup

    gpio-sim



.. only::  subproject and html

Documentation/arm/marvell.rst

+2 −0
Original line number Diff line number Diff line
@@ -266,10 +266,12 @@ Avanta family 
-------------



  Flavors:

       - 88F6500

       - 88F6510

       - 88F6530P

       - 88F6550

       - 88F6560

       - 88F6601



  Homepage:

	https://web.archive.org/web/20181005145041/http://www.marvell.com/broadband/

Documentation/arm64/silicon-errata.rst

+12 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ stable kernels. 
| Allwinner      | A64/R18         | UNKNOWN1        | SUN50I_ERRATUM_UNKNOWN1     |

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

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

| ARM            | Cortex-A510     | #2064142        | ARM64_ERRATUM_2064142       |

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

| ARM            | Cortex-A510     | #2038923        | ARM64_ERRATUM_2038923       |

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

| ARM            | Cortex-A510     | #1902691        | ARM64_ERRATUM_1902691       |

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

| ARM            | Cortex-A53      | #826319         | ARM64_ERRATUM_826319        |

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

| ARM            | Cortex-A53      | #827319         | ARM64_ERRATUM_827319        |
@@ -92,12 +98,18 @@ stable kernels. 
+----------------+-----------------+-----------------+-----------------------------+

| ARM            | Cortex-A77      | #1508412        | ARM64_ERRATUM_1508412       |

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

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

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

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

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

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

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

| ARM            | Cortex-A710     | #2224489        | ARM64_ERRATUM_2224489       |

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

| ARM            | Cortex-X2       | #2119858        | ARM64_ERRATUM_2119858       |

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

| ARM            | Cortex-X2       | #2224489        | ARM64_ERRATUM_2224489       |

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

| ARM            | Neoverse-N1     | #1188873,1418040| ARM64_ERRATUM_1418040       |

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

| ARM            | Neoverse-N1     | #1349291        | N/A                         |

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: