Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (8b0308fe) · Commits · 戴 / test

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

+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

+1 −1

Original line number	Diff line number	Diff line
		@@ -690,7 +690,7 @@ which of the two parameters is added to the kernel command line. In the
		instruction of the CPUs (which, as a rule, suspends the execution of the program
		and causes the hardware to attempt to enter the shallowest available idle state)
		for this purpose, and if ``idle=poll`` is used, idle CPUs will execute a
		more or less ``lightweight'' sequence of instructions in a tight loop. [Note
		more or less "lightweight" sequence of instructions in a tight loop. [Note
		that using ``idle=poll`` is somewhat drastic in many cases, as preventing idle
		CPUs from saving almost any energy at all may not be the only effect of it.
		For example, on Intel hardware it effectively prevents CPUs from using

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ properties:
		compatible:
		items:
		- const: raspberrypi,bcm2835-firmware
		- const: simple-bus
		- const: simple-mfd

		mboxes:
		$ref: '/schemas/types.yaml#/definitions/phandle'
		@@ -57,7 +57,7 @@ required:
		examples:
		- \|
		firmware {
		compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
		compatible = "raspberrypi,bcm2835-firmware", "simple-mfd";
		mboxes = <&mailbox>;

		firmware_clocks: clocks {

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ examples:

		main_crypto: crypto@4e00000 {
		compatible = "ti,j721-sa2ul";
		reg = <0x0 0x4e00000 0x0 0x1200>;
		reg = <0x4e00000 0x1200>;
		power-domains = <&k3_pds 264 TI_SCI_PD_EXCLUSIVE>;
		dmas = <&main_udmap 0xc000>, <&main_udmap 0x4000>,
		<&main_udmap 0x4001>;