Merge tag 'v5.5-rc3' into sched/core, to pick up fixes (1e5f8a30) · Commits · 戴 / test

.gitattributes

+2 −0

Original line number	Diff line number	Diff line
		*.c diff=cpp
		*.h diff=cpp
		*.dtsi diff=dts
		*.dts diff=dts

.mailmap

+7 −0

Original line number	Diff line number	Diff line
		@@ -105,6 +105,9 @@ James E Wilson <wilson@specifix.com>
		James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
		James Hogan <jhogan@kernel.org> <james@albanarts.com>
		James Ketrenos <jketreno@io.(none)>
		Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
		Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
		Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
		Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
		@@ -149,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>
		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>
		@@ -262,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.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>
		@@ -273,3 +278,5 @@ Gustavo Padovan <gustavo@las.ic.unicamp.br>
		Gustavo Padovan <padovan@profusion.mobi>
		Changbin Du <changbin.du@intel.com> <changbin.du@intel.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>

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/device-mapper/dm-integrity.rst

+1 −1

Original line number	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
		attacker can't read the journal. You can use a block cipher here
		(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,
		an attacker reading the journal could see the last sector nubmers

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

+1 −0

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

Admin message