Merge branch 'x86/urgent' into x86/cleanups (2d65685a) · Commits · 戴 / test

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -143,6 +143,9 @@ x509.genkey
		/allrandom.config
		/allyes.config

		# Kconfig savedefconfig output
		/defconfig

		# Kdevelop4
		*.kdev4

.mailmap

+8 −0

Original line number	Diff line number	Diff line
		@@ -90,11 +90,16 @@ Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
		Frank Zago <fzago@systemfabricworks.com>
		Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
		Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
		Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
		Greg Kroah-Hartman <greg@echidna.(none)>
		Greg Kroah-Hartman <gregkh@suse.de>
		Greg Kroah-Hartman <greg@kroah.com>
		Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
		Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
		Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>
		Heiko Carstens <hca@linux.ibm.com> <heiko.carstens@de.ibm.com>
		Henk Vergonet <Henk.Vergonet@gmail.com>
		Henrik Kretzschmar <henne@nachtwindheim.de>
		Henrik Rydberg <rydberg@bitmath.org>
		@@ -193,6 +198,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
		Mayuresh Janorkar <mayur@ti.com>
		Michael Buesch <m@bues.ch>
		Michel Dänzer <michel@tungstengraphics.com>
		Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
		Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
		Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>
		Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
		Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
		Mitesh shah <mshah@teja.com>

Documentation/ABI/testing/dev-kmsg

+0 −5

Original line number	Diff line number	Diff line
		@@ -56,11 +56,6 @@ Description: The /dev/kmsg character device node provides userspace access
		seek after the last record available at the time
		the last SYSLOG_ACTION_CLEAR was issued.

		Due to the record nature of this interface with a "read all"
		behavior and the specific positions each seek operation sets,
		SEEK_CUR is not supported, returning -ESPIPE (invalid seek) to
		errno whenever requested.

		The output format consists of a prefix carrying the syslog
		prefix including priority and facility, the 64 bit message
		sequence number and the monotonic timestamp in microseconds,

Documentation/ABI/testing/sysfs-bus-papr-pmem

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/nd/devices/nmemX/papr/flags
		Date: Apr, 2020
		KernelVersion: v5.8
		Contact: linuxppc-dev <linuxppc-dev@lists.ozlabs.org>, linux-nvdimm@lists.01.org,
		Description:
		(RO) Report flags indicating various states of a
		papr-pmem NVDIMM device. Each flag maps to a one or
		more bits set in the dimm-health-bitmap retrieved in
		response to H_SCM_HEALTH hcall. The details of the bit
		flags returned in response to this hcall is available
		at 'Documentation/powerpc/papr_hcalls.rst' . Below are
		the flags reported in this sysfs file:

		* "not_armed" : Indicates that NVDIMM contents will not
		survive a power cycle.
		* "flush_fail" : Indicates that NVDIMM contents
		couldn't be flushed during last
		shut-down event.
		* "restore_fail": Indicates that NVDIMM contents
		couldn't be restored during NVDIMM
		initialization.
		* "encrypted" : NVDIMM contents are encrypted.
		* "smart_notify": There is health event for the NVDIMM.
		* "scrubbed" : Indicating that contents of the
		NVDIMM have been scrubbed.
		* "locked" : Indicating that NVDIMM contents cant
		be modified until next power cycle.

Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

+4 −4

Original line number	Diff line number	Diff line
		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		Set a_bus_req(A-device bus request) input to be 1 if
		@@ -17,7 +17,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read
		The a_bus_drop(A-device bus drop) input is 1 when the
		@@ -32,7 +32,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Can be set and read.
		The b_bus_req(B-device bus request) input is 1 during the time
		@@ -47,7 +47,7 @@ Description:

		What: /sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err
		Date: Feb 2014
		Contact: Li Jun <b47624@freescale.com>
		Contact: Li Jun <jun.li@nxp.com>
		Description:
		Only can be set.
		The a_clr_err(A-device Vbus error clear) input is used to clear

Admin message