Commit 3d474313 authored by Dave Airlie's avatar Dave Airlie
Browse files

Backmerge v5.5-rc7 into drm-next 



msm needs 5.5-rc4, go to the latest.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents df95968f def9d278

.mailmap

+3 −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>
@@ -152,6 +153,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>

Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>

Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
@@ -265,6 +267,7 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org> 
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>

Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>

Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>

Vivien Didelot <vivien.didelot@gmail.com> <vivien.didelot@savoirfairelinux.com>

Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>

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

+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>

Documentation/ABI/testing/sysfs-platform-mellanox-bootctl

+5 −5
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/MLNXBF04:00/driver/lifecycle_state

What:		/sys/bus/platform/devices/MLNXBF04:00/lifecycle_state

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -10,7 +10,7 @@ Description: 
		  GA Non-Secured - Non-Secure chip and not able to change state

		  RMA - Return Merchandise Authorization



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/post_reset_wdog

What:		/sys/bus/platform/devices/MLNXBF04:00/post_reset_wdog

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -19,7 +19,7 @@ Description: 
		to reboot the chip and recover it to the old state if the new

		boot partition fails.



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/reset_action

What:		/sys/bus/platform/devices/MLNXBF04:00/reset_action

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -30,7 +30,7 @@ Description: 
		  emmc - boot from the onchip eMMC

		  emmc_legacy - boot from the onchip eMMC in legacy (slow) mode



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/second_reset_action

What:		/sys/bus/platform/devices/MLNXBF04:00/second_reset_action

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"
@@ -44,7 +44,7 @@ Description: 
		  swap_emmc - swap the primary / secondary boot partition

		  none - cancel the action



What:		/sys/bus/platform/devices/MLNXBF04:00/driver/secure_boot_fuse_state

What:		/sys/bus/platform/devices/MLNXBF04:00/secure_boot_fuse_state

Date:		Oct 2019

KernelVersion:	5.5

Contact:	"Liming Sun <lsun@mellanox.com>"

Documentation/admin-guide/devices.txt

+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

Documentation/admin-guide/ext4.rst

+11 −8
Original line number Diff line number Diff line
@@ -181,14 +181,17 @@ When mounting an ext4 filesystem, the following option are accepted: 
        system after its metadata has been committed to the journal.



  commit=nrsec	(*)

        Ext4 can be told to sync all its data and metadata every 'nrsec'

        seconds. The default value is 5 seconds.  This means that if you lose

        your power, you will lose as much as the latest 5 seconds of work (your

        filesystem will not be damaged though, thanks to the journaling).  This

        default value (or any low value) will hurt performance, but it's good

        for data-safety.  Setting it to 0 will have the same effect as leaving

        it at the default (5 seconds).  Setting it to very large values will

        improve performance.

        This setting limits the maximum age of the running transaction to

        'nrsec' seconds.  The default value is 5 seconds.  This means that if

        you lose your power, you will lose as much as the latest 5 seconds of

        metadata changes (your filesystem will not be damaged though, thanks

        to the journaling). This default value (or any low value) will hurt

        performance, but it's good for data-safety.  Setting it to 0 will have

        the same effect as leaving it at the default (5 seconds).  Setting it

        to very large values will improve performance.  Note that due to

        delayed allocation even older data can be lost on power failure since

        writeback of those data begins only after time set in

        /proc/sys/vm/dirty_expire_centisecs.



  barrier=<0|1(*)>, barrier(*), nobarrier

        This enables/disables the use of write barriers in the jbd code.