Merge 5.4-rc7 into staging-next (f0cb9b5d) · Commits · 戴 / test

.mailmap

+4 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,10 @@ Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
		Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
		Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
		Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
		Jean Tourrilhes <jt@hpl.hp.com>
		<jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
		Jeff Garzik <jgarzik@pretzel.yyz.us>

+6 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,11 @@ stable kernels.
		\| ARM \| MMU-500 \| #841119,826419 \| N/A \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| Broadcom \| Brahma-B53 \| N/A \| ARM64_ERRATUM_845719 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Broadcom \| Brahma-B53 \| N/A \| ARM64_ERRATUM_843419 \|
		+----------------+-----------------+-----------------+-----------------------------+
		+----------------+-----------------+-----------------+-----------------------------+
		\| Cavium \| ThunderX ITS \| #22375,24313 \| CAVIUM_ERRATUM_22375 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Cavium \| ThunderX ITS \| #23144 \| CAVIUM_ERRATUM_23144 \|
		@@ -126,7 +131,7 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Kryo/Falkor v1 \| E1003 \| QCOM_FALKOR_ERRATUM_1003 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|
		\| Qualcomm Tech. \| Kryo/Falkor v1 \| E1009 \| QCOM_FALKOR_ERRATUM_1009 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| QDF2400 ITS \| E0065 \| QCOM_QDF2400_ERRATUM_0065 \|
		+----------------+-----------------+-----------------+-----------------------------+

+7 −7

Original line number	Diff line number	Diff line
		.. SPDX-License-Identifier: GPL-2.0+

		==============================================================
		Linux* Base Driver for the Intel(R) PRO/100 Family of Adapters
		==============================================================
		=============================================================
		Linux Base Driver for the Intel(R) PRO/100 Family of Adapters
		=============================================================

		June 1, 2018

		@@ -21,7 +21,7 @@ Contents
		In This Release
		===============

		This file describes the Linux* Base Driver for the Intel(R) PRO/100 Family of
		This file describes the Linux Base Driver for the Intel(R) PRO/100 Family of
		Adapters. This driver includes support for Itanium(R)2-based systems.

		For questions related to hardware requirements, refer to the documentation
		@@ -138,9 +138,9 @@ version 1.6 or later is required for this functionality.
		The latest release of ethtool can be found from
		https://www.kernel.org/pub/software/network/ethtool/

		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is provided through the ethtool* utility. For instructions on
		Enabling Wake on LAN (WoL)
		--------------------------
		WoL is provided through the ethtool utility. For instructions on
		enabling WoL with ethtool, refer to the ethtool man page. WoL will be
		enabled on the system during the next shut down or reboot. For this
		driver version, in order to enable WoL, the e100 driver must be loaded

+6 −6

Original line number	Diff line number	Diff line
		.. SPDX-License-Identifier: GPL-2.0+

		===========================================================
		Linux* Base Driver for Intel(R) Ethernet Network Connection
		===========================================================
		==========================================================
		Linux Base Driver for Intel(R) Ethernet Network Connection
		==========================================================

		Intel Gigabit Linux driver.
		Copyright(c) 1999 - 2013 Intel Corporation.
		@@ -438,10 +438,10 @@ ethtool
		The latest release of ethtool can be found from
		https://www.kernel.org/pub/software/network/ethtool/

		Enabling Wake on LAN* (WoL)
		---------------------------
		Enabling Wake on LAN (WoL)
		--------------------------

		WoL is configured through the ethtool* utility.
		WoL is configured through the ethtool utility.

		WoL will be enabled on the system during the next shut down or reboot.
		For this driver version, in order to enable WoL, the e1000 driver must be

+7 −7

Original line number	Diff line number	Diff line
		.. SPDX-License-Identifier: GPL-2.0+

		======================================================
		Linux* Driver for Intel(R) Ethernet Network Connection
		======================================================
		=====================================================
		Linux Driver for Intel(R) Ethernet Network Connection
		=====================================================

		Intel Gigabit Linux driver.
		Copyright(c) 2008-2018 Intel Corporation.
		@@ -338,7 +338,7 @@ and higher cannot be forced. Use the autonegotiation advertising setting to
		manually set devices for 1 Gbps and higher.

		Speed, duplex, and autonegotiation advertising are configured through the
		ethtool* utility.
		ethtool utility.

		Caution: Only experienced network administrators should force speed and duplex
		or change autonegotiation advertising manually. The settings at the switch must
		@@ -351,9 +351,9 @@ will not attempt to auto-negotiate with its link partner since those adapters
		operate only in full duplex and only at their native speed.


		Enabling Wake on LAN* (WoL)
		---------------------------
		WoL is configured through the ethtool* utility.
		Enabling Wake on LAN (WoL)
		--------------------------
		WoL is configured through the ethtool utility.

		WoL will be enabled on the system during the next shut down or reboot. For
		this driver version, in order to enable WoL, the e1000e driver must be loaded