Commit dc1d9408 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt (Google)
Browse files

Merge commit 'f35dbac6' into trace/ring-buffer/core 



The commit f35dbac6 ("ring-buffer: Fix to update per-subbuf entries of
persistent ring buffer") was a fix and merged upstream. It is needed for
some other work in the ring buffer. The current branch has the remote
buffer code that is shared with the Arm64 subsystem and can't be rebased.

Merge in the upstream commit to allow continuing of the ring buffer work.

Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parents a717943d f35dbac6

.mailmap

+2 −1
Original line number Diff line number Diff line
@@ -498,7 +498,8 @@ Lior David <quic_liord@quicinc.com> <liord@codeaurora.org> 
Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@linaro.org>

Loic Poulain <loic.poulain@oss.qualcomm.com> <loic.poulain@intel.com>

Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>

Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>

Lorenzo Stoakes <ljs@kernel.org> <lstoakes@gmail.com>

Lorenzo Stoakes <ljs@kernel.org> <lorenzo.stoakes@oracle.com>

Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>

Luca Weiss <luca@lucaweiss.eu> <luca@z3ntu.xyz>

Lucas De Marchi <demarchi@kernel.org> <lucas.demarchi@intel.com>

Documentation/ABI/testing/sysfs-block-zram

+2 −2
Original line number Diff line number Diff line
@@ -151,11 +151,11 @@ Description: 
		The algorithm_params file is write-only and is used to setup

		compression algorithm parameters.



What:		/sys/block/zram<id>/writeback_compressed

What:		/sys/block/zram<id>/compressed_writeback

Date:		Decemeber 2025

Contact:	Richard Chang <richardycc@google.com>

Description:

		The writeback_compressed device atrribute toggles compressed

		The compressed_writeback device atrribute toggles compressed

		writeback feature.



What:		/sys/block/zram<id>/writeback_batch_size

Documentation/admin-guide/blockdev/zram.rst

+3 −3
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ writeback_limit WO specifies the maximum amount of write IO zram 
writeback_limit_enable  RW	show and set writeback_limit feature

writeback_batch_size	RW	show and set maximum number of in-flight

				writeback operations

writeback_compressed	RW	show and set compressed writeback feature

compressed_writeback	RW	show and set compressed writeback feature

comp_algorithm    	RW	show and change the compression algorithm

algorithm_params	WO	setup compression algorithm parameters

compact           	WO	trigger memory compaction
@@ -439,11 +439,11 @@ budget in next setting is user's job. 
By default zram stores written back pages in decompressed (raw) form, which

means that writeback operation involves decompression of the page before

writing it to the backing device.  This behavior can be changed by enabling

`writeback_compressed` feature, which causes zram to write compressed pages

`compressed_writeback` feature, which causes zram to write compressed pages

to the backing device, thus avoiding decompression overhead.  To enable

this feature, execute::



	$ echo yes > /sys/block/zramX/writeback_compressed

	$ echo yes > /sys/block/zramX/compressed_writeback



Note that this feature should be configured before the `zramX` device is

initialized.

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -8196,6 +8196,9 @@ Kernel parameters 
				p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT

					(Reduce timeout of the SET_ADDRESS

					request from 5000 ms to 500 ms);

				q = USB_QUIRK_FORCE_ONE_CONFIG (Device

					claims zero configurations,

					forcing to 1);

			Example: quirks=0781:5580:bk,0a5c:5834:gij



	usbhid.mousepoll=

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+20 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ allOf: 
            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only

              - qcom,glymur-dp

              - qcom,sc8280xp-dp

              - qcom,x1e80100-dp

    then:
@@ -310,6 +309,26 @@ allOf: 
          minItems: 6

          maxItems: 8



  - if:

      properties:

        compatible:

          contains:

            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only, but all controllers have 4 ports

              - qcom,glymur-dp

    then:

      properties:

        reg:

          minItems: 9

          maxItems: 9

        clocks:

          minItems: 5

          maxItems: 6

        clocks-names:

          minItems: 5

          maxItems: 6



unevaluatedProperties: false



examples: