Merge branch 'locking/urgent' into locking/core, to pick up fixes (e705d397) · Commits · 戴 / test

.clang-format

+12 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@ ForEachMacros:
		- 'css_for_each_descendant_pre'
		- 'device_for_each_child_node'
		- 'dma_fence_chain_for_each'
		- 'do_for_each_ftrace_op'
		- 'drm_atomic_crtc_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane'
		- 'drm_atomic_crtc_state_for_each_plane_state'
		@@ -136,6 +137,7 @@ ForEachMacros:
		- 'for_each_active_dev_scope'
		- 'for_each_active_drhd_unit'
		- 'for_each_active_iommu'
		- 'for_each_aggr_pgid'
		- 'for_each_available_child_of_node'
		- 'for_each_bio'
		- 'for_each_board_func_rsrc'
		@@ -234,6 +236,7 @@ ForEachMacros:
		- 'for_each_node_state'
		- 'for_each_node_with_cpus'
		- 'for_each_node_with_property'
		- 'for_each_nonreserved_multicast_dest_pgid'
		- 'for_each_of_allnodes'
		- 'for_each_of_allnodes_from'
		- 'for_each_of_cpu_node'
		@@ -256,6 +259,7 @@ ForEachMacros:
		- 'for_each_pci_dev'
		- 'for_each_pci_msi_entry'
		- 'for_each_pcm_streams'
		- 'for_each_physmem_range'
		- 'for_each_populated_zone'
		- 'for_each_possible_cpu'
		- 'for_each_present_cpu'
		@@ -265,6 +269,8 @@ ForEachMacros:
		- 'for_each_process_thread'
		- 'for_each_property_of_node'
		- 'for_each_registered_fb'
		- 'for_each_requested_gpio'
		- 'for_each_requested_gpio_in_range'
		- 'for_each_reserved_mem_region'
		- 'for_each_rtd_codec_dais'
		- 'for_each_rtd_codec_dais_rollback'
		@@ -278,12 +284,17 @@ ForEachMacros:
		- 'for_each_sg'
		- 'for_each_sg_dma_page'
		- 'for_each_sg_page'
		- 'for_each_sgtable_dma_page'
		- 'for_each_sgtable_dma_sg'
		- 'for_each_sgtable_page'
		- 'for_each_sgtable_sg'
		- 'for_each_sibling_event'
		- 'for_each_subelement'
		- 'for_each_subelement_extid'
		- 'for_each_subelement_id'
		- '__for_each_thread'
		- 'for_each_thread'
		- 'for_each_unicast_dest_pgid'
		- 'for_each_wakeup_source'
		- 'for_each_zone'
		- 'for_each_zone_zonelist'
		@@ -464,6 +475,7 @@ ForEachMacros:
		- 'v4l2_m2m_for_each_src_buf'
		- 'v4l2_m2m_for_each_src_buf_safe'
		- 'virtio_device_for_each_vq'
		- 'while_for_each_ftrace_op'
		- 'xa_for_each'
		- 'xa_for_each_marked'
		- 'xa_for_each_range'

.mailmap

+5 −0

Original line number	Diff line number	Diff line
		@@ -169,6 +169,10 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
		Kamil Konieczny <k.konieczny@samsung.com> <k.konieczny@partner.samsung.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
		Kees Cook <keescook@chromium.org> <keescook@google.com>
		Kees Cook <keescook@chromium.org> <kees@outflux.net>
		Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
		@@ -308,6 +312,7 @@ Tony Luck <tony.luck@intel.com>
		TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
		TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
		Tycho Andersen <tycho@tycho.pizza> <tycho@tycho.ws>
		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
		Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Documentation/RCU/lockdep.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ checking of rcu_dereference() primitives:
		is invoked by both RCU-sched readers and updaters.
		srcu_dereference_check(p, c):
		Use explicit check expression "c" along with
		srcu_read_lock_held()(). This is useful in code that
		srcu_read_lock_held(). This is useful in code that
		is invoked by both SRCU readers and updaters.
		rcu_dereference_raw(p):
		Don't check. (Use sparingly, if at all.)

Documentation/admin-guide/cgroup-v2.rst

+18 −7

Original line number	Diff line number	Diff line
		@@ -1324,15 +1324,26 @@ PAGE_SIZE multiple when read back.
		pgmajfault
		Number of major page faults incurred

		workingset_refault
		Number of refaults of previously evicted pages
		workingset_refault_anon
		Number of refaults of previously evicted anonymous pages.

		workingset_activate
		Number of refaulted pages that were immediately activated
		workingset_refault_file
		Number of refaults of previously evicted file pages.

		workingset_restore
		Number of restored pages which have been detected as an active
		workingset before they got reclaimed.
		workingset_activate_anon
		Number of refaulted anonymous pages that were immediately
		activated.

		workingset_activate_file
		Number of refaulted file pages that were immediately activated.

		workingset_restore_anon
		Number of restored anonymous pages which have been detected as
		an active workingset before they got reclaimed.

		workingset_restore_file
		Number of restored file pages which have been detected as an
		active workingset before they got reclaimed.

		workingset_nodereclaim
		Number of times a shadow node has been reclaimed

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ Parameters::
		the value passed in <key_size>.

		<key_type>
		Either 'logon' or 'user' kernel key type.
		Either 'logon', 'user' or 'encrypted' kernel key type.

		<key_description>
		The kernel keyring key description crypt target should look for
		@@ -121,6 +121,14 @@ submit_from_crypt_cpus
		thread because it benefits CFQ to have writes submitted using the
		same context.

		no_read_workqueue
		Bypass dm-crypt internal workqueue and process read requests synchronously.

		no_write_workqueue
		Bypass dm-crypt internal workqueue and process write requests synchronously.
		This option is automatically enabled for host-managed zoned block devices
		(e.g. host-managed SMR hard-disks).

		integrity:<bytes>:<type>
		The device requires additional <bytes> metadata per-sector stored
		in per-bio integrity structure. This metadata must by provided

Admin message