Merge 5.5-rc7 into char-misc-next (fd2d11cc) · Commits · 戴 / test

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ Jacob Shin <Jacob.Shin@amd.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
		Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
		Jakub Kicinski <kuba@kernel.org> <jakub.kicinski@netronome.com>
		James Bottomley <jejb@mulgrave.(none)>
		James Bottomley <jejb@titanic.il.steeleye.com>
		James E Wilson <wilson@specifix.com>

+11 −2

Original line number	Diff line number	Diff line
		@@ -29,13 +29,13 @@ Description: This file shows the system fans direction:

		The files are read only.

		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
		What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version

		Date: November 2018
		KernelVersion: 5.0
		Contact: Vadim Pasternak <vadimpmellanox.com>
		Description: These files show with which CPLD versions have been burned
		on LED board.
		on LED or Gearbox board.

		The files are read only.

		@@ -121,6 +121,15 @@ Description: These files show the system reset cause, as following: ComEx

		The files are read only.

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

		The files are read only.

		Date: June 2019
		KernelVersion: 5.3
		Contact: Vadim Pasternak <vadimpmellanox.com>

+1 −1

Original line number	Diff line number	Diff line
		@@ -319,7 +319,7 @@
		182 = /dev/perfctr Performance-monitoring counters
		183 = /dev/hwrng Generic random number generator
		184 = /dev/cpu/microcode CPU microcode update interface
		186 = /dev/atomicps Atomic shapshot of process state data
		186 = /dev/atomicps Atomic snapshot of process state data
		187 = /dev/irnet IrNET device
		188 = /dev/smbusbios SMBus BIOS
		189 = /dev/ussp_ctl User space serial port control

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ so all video4linux tools (like xawtv) should work with this driver.

		Besides the video4linux interface, the driver has a private interface
		for accessing the Motion Eye extended parameters (camera sharpness,
		agc, video framerate), the shapshot and the MJPEG capture facilities.
		agc, video framerate), the snapshot and the MJPEG capture facilities.

		This interface consists of several ioctls (prototypes and structures
		can be found in include/linux/meye.h):

+1 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ an involved disclosed party. The current ambassadors list:
		Red Hat Josh Poimboeuf <jpoimboe@redhat.com>
		SUSE Jiri Kosina <jkosina@suse.cz>

		Amazon
		Amazon Peter Bowen <pzb@amzn.com>
		Google Kees Cook <keescook@chromium.org>
		============= ========================================================