Commit efd13b71 authored by David S. Miller's avatar David S. Miller
Browse files

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



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 84c7f6c3 00232240

.mailmap

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ Andrew Morton <akpm@linux-foundation.org> 
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>

Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>

Andrew Vasquez <andrew.vasquez@qlogic.com>

Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>

Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>

Andy Adamson <andros@citi.umich.edu>
@@ -65,6 +66,8 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com> 
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>

Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>

Chao Yu <chao@kernel.org> <yuchao0@huawei.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>

Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>

Christophe Ricard <christophe.ricard@gmail.com>

Christoph Hellwig <hch@lst.de>

Corey Minyard <minyard@acm.org>

Documentation/ABI/testing/sysfs-fs-xfs

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Contact: xfs@oss.sgi.com 
Description:

		The current state of the log write grant head. It

		represents the total log reservation of all currently

		oustanding transactions, including regrants due to

		outstanding transactions, including regrants due to

		rolling transactions. The grant head is exported in

		"cycle:bytes" format.

Users:		xfstests

Documentation/arm64/acpi_object_usage.rst

+5 −5
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ For ACPI on arm64, tables also fall into the following categories: 


       -  Recommended: BERT, EINJ, ERST, HEST, PCCT, SSDT



       -  Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IORT,

          MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT, STAO,

	  TCPA, TPM2, UEFI, XENV

       -  Optional: BGRT, CPEP, CSRT, DBG2, DRTM, ECDT, FACS, FPDT, IBFT,

          IORT, MCHI, MPST, MSCT, NFIT, PMTT, RASF, SBST, SLIT, SPMI, SRAT,

          STAO, TCPA, TPM2, UEFI, XENV



       -  Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IBFT, IVRS, LPIT,

          MSDM, OEMx, PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT

       -  Not supported: BOOT, DBGP, DMAR, ETDT, HPET, IVRS, LPIT, MSDM, OEMx,

          PSDT, RSDT, SLIC, WAET, WDAT, WDRT, WPBT



====== ========================================================================

Table  Usage for ARMv8 Linux

Documentation/arm64/silicon-errata.rst

+3 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ stable kernels. 
| Marvell        | ARM-MMU-500     | #582743         | N/A                         |

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

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

| NVIDIA         | Carmel Core     | N/A             | NVIDIA_CARMEL_CNP_ERRATUM   |

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

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

| Freescale/NXP  | LS2080A/LS1043A | A-008585        | FSL_ERRATUM_A008585         |

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

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

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - enum:

              - ingenic,jz4775-intc

              - ingenic,jz4770-intc

              - ingenic,jz4760b-intc

          - const: ingenic,jz4760-intc

      - items:

          - const: ingenic,x1000-intc