Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 23d19ba0 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

Merge drm/drm-next into drm-misc-next 



drm-next has been forwarded to 5.0-rc1, and we need it to apply the damage
helper for dirtyfb series from Noralf Trønnes.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parents 7d0250ed e3d09307

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
*.bin

*.bz2

*.c.[012]*.*

*.dt.yaml

*.dtb

*.dtb.S

*.dwo

.mailmap

+8 −4
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com> 
Ben Gardner <bgardner@wabtec.com>

Ben M Cahill <ben.m.cahill@intel.com>

Björn Steinbrink <B.Steinbrink@gmx.de>

Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>

Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>

Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>

Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>

Brian Avery <b.avery@hp.com>

Brian King <brking@us.ibm.com>

Christoph Hellwig <hch@lst.de>
@@ -47,7 +48,10 @@ Corey Minyard <minyard@acm.org> 
Damian Hobson-Garcia <dhobsong@igel.co.jp>

David Brownell <david-b@pacbell.net>

David Woodhouse <dwmw2@shinybook.infradead.org>

Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Domen Puncer <domen@coderock.org>

Douglas Gilbert <dougg@torque.net>

CREDITS

+14 −0
Original line number Diff line number Diff line
@@ -2208,6 +2208,12 @@ N: Christopher Li 
E: sparse@chrisli.org

D: Sparse maintainer 2009 - 2018



N: Shaohua Li

D: Worked on many parts of the kernel, from core x86, ACPI, PCI, KVM, MM,

D: and much more. He was the maintainer of MD from 2016 to 2018. Shaohua

D: passed away late 2018, he will be greatly missed.

W: https://www.spinics.net/lists/raid/msg61993.html



N: Stephan Linz

E: linz@mazet.de

E: Stephan.Linz@gmx.de
@@ -2541,6 +2547,10 @@ S: Ormond 
S: Victoria 3163

S: Australia



N: Eric Miao

E: eric.y.miao@gmail.com

D: MMP support



N: Pauline Middelink

E: middelin@polyware.nl

D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4125,10 @@ S: 1507 145th Place SE #B5 
S: Bellevue, Washington 98007

S: USA



N: Haojian Zhuang

E: haojian.zhuang@gmail.com

D: MMP support



N: Richard Zidlicky

E: rz@linux-m68k.org, rdzidlic@geocities.com

W: http://www.geocities.com/rdzidlic

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

+40 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ Description: This file shows ASIC health status. The possible values are: 
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/

							cpld1_version

							cpld2_version



Date:		June 2018

KernelVersion:	4.19

Contact:	Vadim Pasternak <vadimpmellanox.com>
@@ -21,6 +20,28 @@ Description: These files show with which CPLD versions have been burned 


		The files are read only.



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

							cpld3_version



Date:		November 2018

KernelVersion:	4.21

Contact:	Vadim Pasternak <vadimpmellanox.com>

Description:	These files show with which CPLD versions have been burned

		on LED board.



		The files are read only.



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

							jtag_enable



Date:		November 2018

KernelVersion:	4.21

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.



		The file is read/write.



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

Date:		June 2018

KernelVersion:	4.19
@@ -76,3 +97,21 @@ Description: These files show the system reset cause, as following: power 
		reset cause.



		The files are read only.



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

						reset_comex_pwr_fail

						reset_from_comex

						reset_system

						reset_voltmon_upgrade_fail



Date:		November 2018

KernelVersion:	4.21

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

		due to voltage monitor devices upgrade failure,

		Value 1 in file means this is reset cause, 0 - otherwise.

		Only one bit could be 1 at the same time, representing only

		the last reset cause.



		The files are read only.

Documentation/ABI/testing/sysfs-block

+10 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ Description: 


What:		/sys/block/<disk>/queue/zoned

Date:		September 2016

Contact:	Damien Le Moal <damien.lemoal@hgst.com>

Contact:	Damien Le Moal <damien.lemoal@wdc.com>

Description:

		zoned indicates if the device is a zoned block device

		and the zone model of the device if it is indeed zoned.
@@ -259,6 +259,14 @@ Description: 
		zone commands, they will be treated as regular block

		devices and zoned will report "none".



What:		/sys/block/<disk>/queue/nr_zones

Date:		November 2018

Contact:	Damien Le Moal <damien.lemoal@wdc.com>

Description:

		nr_zones indicates the total number of zones of a zoned block

		device ("host-aware" or "host-managed" zone model). For regular

		block devices, the value is always 0.



What:		/sys/block/<disk>/queue/chunk_sectors

Date:		September 2016

Contact:	Hannes Reinecke <hare@suse.com>
@@ -268,6 +276,6 @@ Description: 
		indicates the size in 512B sectors of the RAID volume

		stripe segment. For a zoned block device, either

		host-aware or host-managed, chunk_sectors indicates the

		size of 512B sectors of the zones of the device, with

		size in 512B sectors of the zones of the device, with

		the eventual exception of the last zone of the device

		which may be smaller.