Merge tag 'asoc-v5.1-2' of... (70395a96) · Commits · 戴 / test

CREDITS

+9 −11

Original line number	Diff line number	Diff line
		@@ -842,10 +842,9 @@ D: ax25-utils maintainer.

		N: Helge Deller
		E: deller@gmx.de
		E: hdeller@redhat.de
		D: PA-RISC Linux hacker, LASI-, ASP-, WAX-, LCD/LED-driver
		S: Schimmelsrain 1
		S: D-69231 Rauenberg
		W: http://www.parisc-linux.org/
		D: PA-RISC Linux architecture maintainer
		D: LASI-, ASP-, WAX-, LCD/LED-driver
		S: Germany

		N: Jean Delvare
		@@ -1361,7 +1360,7 @@ S: Stellenbosch, Western Cape
		S: South Africa

		N: Grant Grundler
		E: grundler@parisc-linux.org
		E: grantgrundler@gmail.com
		W: http://obmouse.sourceforge.net/
		W: http://www.parisc-linux.org/
		D: obmouse - rewrote Olivier Florent's Omnibook 600 "pop-up" mouse driver
		@@ -2492,7 +2491,7 @@ S: Syracuse, New York 13206
		S: USA

		N: Kyle McMartin
		E: kyle@parisc-linux.org
		E: kyle@mcmartin.ca
		D: Linux/PARISC hacker
		D: AD1889 sound driver
		S: Ottawa, Canada
		@@ -3780,14 +3779,13 @@ S: 21513 Conradia Ct
		S: Cupertino, CA 95014
		S: USA

		N: Thibaut Varene
		E: T-Bone@parisc-linux.org
		W: http://www.parisc-linux.org/~varenet/
		P: 1024D/B7D2F063 E67C 0D43 A75E 12A5 BB1C FA2F 1E32 C3DA B7D2 F063
		N: Thibaut Varène
		E: hacks+kernel@slashdirt.org
		W: http://hacks.slashdirt.org/
		D: PA-RISC port minion, PDC and GSCPS2 drivers, debuglocks and other bits
		D: Some ARM at91rm9200 bits, S1D13XXX FB driver, random patches here and there
		D: AD1889 sound driver
		S: Paris, France
		S: France

		N: Heikki Vatiainen
		E: hessu@cs.tut.fi

Documentation/ABI/stable/sysfs-driver-mlxreg-io

+3 −3

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		cpld3_version

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.
		@@ -35,7 +35,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		jtag_enable

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files enable and disable the access to the JTAG domain.
		By default access to the JTAG domain is disabled.
		@@ -105,7 +105,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/
		reset_voltmon_upgrade_fail

		Date: November 2018
		KernelVersion: 4.21
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show the system reset cause, as following: ComEx
		power fail, reset from ComEx, system platform reset, reset

Documentation/admin-guide/README.rst

+16 −16

Original line number	Diff line number	Diff line
		.. _readme:

		Linux kernel release 4.x <http://kernel.org/>
		Linux kernel release 5.x <http://kernel.org/>
		=============================================

		These are the release notes for Linux version 4. Read them carefully,
		These are the release notes for Linux version 5. Read them carefully,
		as they tell you what this is all about, explain how to install the
		kernel, and what to do if something goes wrong.

		@@ -63,7 +63,7 @@ Installing the kernel source
		directory where you have permissions (e.g. your home directory) and
		unpack it::

		xz -cd linux-4.X.tar.xz \| tar xvf -
		xz -cd linux-5.x.tar.xz \| tar xvf -

		Replace "X" with the version number of the latest kernel.

		@@ -72,26 +72,26 @@ Installing the kernel source
		files. They should match the library, and not get messed up by
		whatever the kernel-du-jour happens to be.

		- You can also upgrade between 4.x releases by patching. Patches are
		- You can also upgrade between 5.x releases by patching. Patches are
		distributed in the xz format. To install by patching, get all the
		newer patch files, enter the top level directory of the kernel source
		(linux-4.X) and execute::
		(linux-5.x) and execute::

		xz -cd ../patch-4.x.xz \| patch -p1
		xz -cd ../patch-5.x.xz \| patch -p1

		Replace "x" for all versions bigger than the version "X" of your current
		Replace "x" for all versions bigger than the version "x" of your current
		source tree, in_order, and you should be ok. You may want to remove
		the backup files (some-file-name~ or some-file-name.orig), and make sure
		that there are no failed patches (some-file-name# or some-file-name.rej).
		If there are, either you or I have made a mistake.

		Unlike patches for the 4.x kernels, patches for the 4.x.y kernels
		Unlike patches for the 5.x kernels, patches for the 5.x.y kernels
		(also known as the -stable kernels) are not incremental but instead apply
		directly to the base 4.x kernel. For example, if your base kernel is 4.0
		and you want to apply the 4.0.3 patch, you must not first apply the 4.0.1
		and 4.0.2 patches. Similarly, if you are running kernel version 4.0.2 and
		want to jump to 4.0.3, you must first reverse the 4.0.2 patch (that is,
		patch -R) before applying the 4.0.3 patch. You can read more on this in
		directly to the base 5.x kernel. For example, if your base kernel is 5.0
		and you want to apply the 5.0.3 patch, you must not first apply the 5.0.1
		and 5.0.2 patches. Similarly, if you are running kernel version 5.0.2 and
		want to jump to 5.0.3, you must first reverse the 5.0.2 patch (that is,
		patch -R) before applying the 5.0.3 patch. You can read more on this in
		:ref:`Documentation/process/applying-patches.rst <applying_patches>`.

		Alternatively, the script patch-kernel can be used to automate this
		@@ -114,7 +114,7 @@ Installing the kernel source
		Software requirements
		---------------------

		Compiling and running the 4.x kernels requires up-to-date
		Compiling and running the 5.x kernels requires up-to-date
		versions of various software packages. Consult
		:ref:`Documentation/process/changes.rst <changes>` for the minimum version numbers
		required and how to get updates for these packages. Beware that using
		@@ -132,12 +132,12 @@ Build directory for the kernel
		place for the output files (including .config).
		Example::

		kernel source code: /usr/src/linux-4.X
		kernel source code: /usr/src/linux-5.x
		build directory: /home/name/build/kernel

		To configure and build the kernel, use::

		cd /usr/src/linux-4.X
		cd /usr/src/linux-5.x
		make O=/home/name/build/kernel menuconfig
		make O=/home/name/build/kernel
		sudo make O=/home/name/build/kernel modules_install install

Documentation/admin-guide/kernel-parameters.txt

+3 −4

Original line number	Diff line number	Diff line
		@@ -1696,12 +1696,11 @@
		By default, super page will be supported if Intel IOMMU
		has the capability. With this option, super page will
		not be supported.
		sm_off [Default Off]
		By default, scalable mode will be supported if the
		sm_on [Default Off]
		By default, scalable mode will be disabled even if the
		hardware advertises that it has support for the scalable
		mode translation. With this option set, scalable mode
		will not be used even on hardware which claims to support
		it.
		will be used on hardware which claims to support it.
		tboot_noforce [Default Off]
		Do not force the Intel IOMMU enabled under tboot.
		By default, tboot will force Intel IOMMU on, which

Documentation/devicetree/bindings/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,11 @@ extra-y += $(DT_TMP_SCHEMA)
		quiet_cmd_mk_schema = SCHEMA $@
		cmd_mk_schema = $(DT_MK_SCHEMA) $(DT_MK_SCHEMA_FLAGS) -o $@ $(filter-out FORCE, $^)

		DT_DOCS = $(shell cd $(srctree)/$(src) && find * -name '*.yaml')
		DT_DOCS = $(shell \
		cd $(srctree)/$(src) && \
		find * $ -name '*.yaml' ! -name $(DT_TMP_SCHEMA) $ \
		)

		DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))

		extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))

Admin message