Commit 717d182e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes and get v5.10 development in sync with the main kernel
sources.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents a55b7bb1 fb0155a0

.mailmap

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

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

Documentation/bpf/ringbuf.rst

+1 −4
Original line number Diff line number Diff line
@@ -182,9 +182,6 @@ in the order of reservations, but only after all previous records where 
already committed. It is thus possible for slow producers to temporarily hold

off submitted records, that were reserved later.



Reservation/commit/consumer protocol is verified by litmus tests in

Documentation/litmus_tests/bpf-rb/_.



One interesting implementation bit, that significantly simplifies (and thus

speeds up as well) implementation of both producers and consumers is how data

area is mapped twice contiguously back-to-back in the virtual memory. This
@@ -200,7 +197,7 @@ a self-pacing notifications of new data being availability. 
being available after commit only if consumer has already caught up right up to

the record being committed. If not, consumer still has to catch up and thus

will see new data anyways without needing an extra poll notification.

Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbuf.c_) show that

Benchmarks (see tools/testing/selftests/bpf/benchs/bench_ringbufs.c) show that

this allows to achieve a very high throughput without having to resort to

tricks like "notify only every Nth sample", which are necessary with perf

buffer. For extreme cases, when BPF program wants more manual control of

Documentation/devicetree/bindings/media/i2c/imx274.txt

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
* Sony 1/2.5-Inch 8.51Mp CMOS Digital Image Sensor



The Sony imx274 is a 1/2.5-inch CMOS active pixel digital image sensor with

an active array size of 3864H x 2202V. It is programmable through I2C

interface. The I2C address is fixed to 0x1a as per sensor data sheet.

Image data is sent through MIPI CSI-2, which is configured as 4 lanes

at 1440 Mbps.





Required Properties:

- compatible: value should be "sony,imx274" for imx274 sensor

- reg: I2C bus address of the device



Optional Properties:

- reset-gpios: Sensor reset GPIO

- clocks: Reference to the input clock.

- clock-names: Should be "inck".

- VANA-supply: Sensor 2.8v analog supply.

- VDIG-supply: Sensor 1.8v digital core supply.

- VDDL-supply: Sensor digital IO 1.2v supply.



The imx274 device node should contain one 'port' child node with

an 'endpoint' subnode. For further reading on port node refer to

Documentation/devicetree/bindings/media/video-interfaces.txt.



Example:

	sensor@1a {

		compatible = "sony,imx274";

		reg = <0x1a>;

		#address-cells = <1>;

		#size-cells = <0>;

		reset-gpios = <&gpio_sensor 0 0>;

		port {

			sensor_out: endpoint {

				remote-endpoint = <&csiss_in>;

			};

		};

	};