Merge tag 'v5.5-rc3' into devel (e5399ab2) · Commits · jan.koester / Linux

.mailmap

+4 −0

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

+5 −5

Original line number	Original line	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		Date: Oct 2019
	KernelVersion: 5.5		KernelVersion: 5.5
	Contact: "Liming Sun <lsun@mellanox.com>"		Contact: "Liming Sun <lsun@mellanox.com>"
	@@ -10,7 +10,7 @@ Description:
	GA Non-Secured - Non-Secure chip and not able to change state		GA Non-Secured - Non-Secure chip and not able to change state
	RMA - Return Merchandise Authorization		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		Date: Oct 2019
	KernelVersion: 5.5		KernelVersion: 5.5
	Contact: "Liming Sun <lsun@mellanox.com>"		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		to reboot the chip and recover it to the old state if the new
	boot partition fails.		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		Date: Oct 2019
	KernelVersion: 5.5		KernelVersion: 5.5
	Contact: "Liming Sun <lsun@mellanox.com>"		Contact: "Liming Sun <lsun@mellanox.com>"
	@@ -30,7 +30,7 @@ Description:
	emmc - boot from the onchip eMMC		emmc - boot from the onchip eMMC
	emmc_legacy - boot from the onchip eMMC in legacy (slow) mode		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		Date: Oct 2019
	KernelVersion: 5.5		KernelVersion: 5.5
	Contact: "Liming Sun <lsun@mellanox.com>"		Contact: "Liming Sun <lsun@mellanox.com>"
	@@ -44,7 +44,7 @@ Description:
	swap_emmc - swap the primary / secondary boot partition		swap_emmc - swap the primary / secondary boot partition
	none - cancel the action		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		Date: Oct 2019
	KernelVersion: 5.5		KernelVersion: 5.5
	Contact: "Liming Sun <lsun@mellanox.com>"		Contact: "Liming Sun <lsun@mellanox.com>"

Documentation/admin-guide/device-mapper/dm-integrity.rst

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -144,7 +144,7 @@ journal_crypt:algorithm(:key) (the key is optional)
	Encrypt the journal using given algorithm to make sure that the		Encrypt the journal using given algorithm to make sure that the
	attacker can't read the journal. You can use a block cipher here		attacker can't read the journal. You can use a block cipher here
	(such as "cbc(aes)") or a stream cipher (for example "chacha20",		(such as "cbc(aes)") or a stream cipher (for example "chacha20",
	"salsa20", "ctr(aes)" or "ecb(arc4)").		"salsa20" or "ctr(aes)").

	The journal contains history of last writes to the block device,		The journal contains history of last writes to the block device,
	an attacker reading the journal could see the last sector nubmers		an attacker reading the journal could see the last sector nubmers

Documentation/admin-guide/device-mapper/index.rst

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@ Device Mapper
	cache-policies		cache-policies
	cache		cache
	delay		delay
			dm-clone
	dm-crypt		dm-crypt
	dm-dust		dm-dust
	dm-flakey		dm-flakey

Documentation/admin-guide/ext4.rst

+11 −8

Original line number	Original line	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.		system after its metadata has been committed to the journal.

	commit=nrsec (*)		commit=nrsec (*)
	Ext4 can be told to sync all its data and metadata every 'nrsec'		This setting limits the maximum age of the running transaction to
	seconds. The default value is 5 seconds. This means that if you lose		'nrsec' seconds. The default value is 5 seconds. This means that if
	your power, you will lose as much as the latest 5 seconds of work (your		you lose your power, you will lose as much as the latest 5 seconds of
	filesystem will not be damaged though, thanks to the journaling). This		metadata changes (your filesystem will not be damaged though, thanks
	default value (or any low value) will hurt performance, but it's good		to the journaling). This default value (or any low value) will hurt
	for data-safety. Setting it to 0 will have the same effect as leaving		performance, but it's good for data-safety. Setting it to 0 will have
	it at the default (5 seconds). Setting it to very large values will		the same effect as leaving it at the default (5 seconds). Setting it
	improve performance.		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		barrier=<0\|1()>, barrier(), nobarrier
	This enables/disables the use of write barriers in the jbd code.		This enables/disables the use of write barriers in the jbd code.

Original line number	Original line	Diff line number	Diff line
	@@ -152,6 +152,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
	Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>		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> <leo@zh-kernel.org>
	Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>		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>		Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
	Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>		Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
	Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>		Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
	@@ -265,6 +266,7 @@ Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.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>		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@virtuozzo.com>
	Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>		Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
	@@ -276,3 +278,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
	Gustavo Padovan <padovan@profusion.mobi>		Gustavo Padovan <padovan@profusion.mobi>
	Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>		Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
	Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>		Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
			Steve Wise <larrystevenwise@gmail.com> <swise@chelsio.com>
			Steve Wise <larrystevenwise@gmail.com> <swise@opengridcomputing.com>