Commit 3c691407 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.11/trivial' into for-linus 

Couple of trivial fixes:
- extra semicolon (Chen Ni)
- typo (Thorsten Blum)
parents 5ba28be6 8a25418b

.mailmap

+6 −5
Original line number Diff line number Diff line
@@ -337,10 +337,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org> 
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>

Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>

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>

Kees Cook <kees@kernel.org> <kees.cook@canonical.com>

Kees Cook <kees@kernel.org> <keescook@chromium.org>

Kees Cook <kees@kernel.org> <keescook@google.com>

Kees Cook <kees@kernel.org> <kees@outflux.net>

Kees Cook <kees@kernel.org> <kees@ubuntu.com>

Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>

Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>

Kenneth W Chen <kenneth.w.chen@intel.com>
@@ -572,7 +573,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org> 
Sascha Hauer <s.hauer@pengutronix.de>

Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>

Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>

Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>

S.Çağlar Onur <caglar@pardus.org.tr>

Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>

Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

Documentation/ABI/stable/sysfs-bus-mhi

+13 −0
Original line number Diff line number Diff line
@@ -29,3 +29,16 @@ Description: Initiates a SoC reset on the MHI controller. A SoC reset is 
                This can be useful as a method of recovery if the device is

                non-responsive, or as a means of loading new firmware as a

                system administration task.



What:           /sys/bus/mhi/devices/.../trigger_edl

Date:           April 2024

KernelVersion:  6.10

Contact:        mhi@lists.linux.dev

Description:    Writing a non-zero value to this file will force devices to

                enter EDL (Emergency Download) mode. This entry only exists for

                devices capable of entering the EDL mode using the standard EDL

                triggering mechanism defined in the MHI spec v1.2. Once in EDL

                mode, the flash programmer image can be downloaded to the

                device to enter the flash programmer execution environment.

                This can be useful if user wants to use QDL (Qualcomm Download,

                which is used to download firmware over EDL) to update firmware.

Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Contact: Mathieu Poirier <mathieu.poirier@linaro.org> 
Description:	(RW) Used in conjunction with @addr_idx.  Specifies

		characteristics about the address comparator being configure,

		for example the access type, the kind of instruction to trace,

		processor contect ID to trigger on, etc.  Individual fields in

		processor context ID to trigger on, etc.  Individual fields in

		the access type register may vary on the version of the trace

		entity.

Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ Date: August 2023 
KernelVersion:	6.7

Contact:	Anshuman Khandual <anshuman.khandual@arm.com>

Description:	(Read) Shows all supported Coresight TMC-ETR buffer modes available

		for the users to configure explicitly. This file is avaialble only

		for the users to configure explicitly. This file is available only

		for TMC ETR devices.



What:		/sys/bus/coresight/devices/<memory_map>.tmc/buf_mode_preferred

Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

+1 −1
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ KernelVersion 6.9 
Contact:	Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>

Description:

		(RW) Read or write the status of timestamp upon all interface.

		Only value 0 and 1  can be written to this node. Set this node to 1 to requeset

		Only value 0 and 1  can be written to this node. Set this node to 1 to request

		timestamp to all trace packet.

		Accepts only one of the 2 values -  0 or 1.

		0 : Disable the timestamp of all trace packets.