Skip to content

Commit 3c69140

Browse files
author
Benjamin Tissoires
committed
Merge branch 'for-6.11/trivial' into for-linus
Couple of trivial fixes: - extra semicolon (Chen Ni) - typo (Thorsten Blum)
2 parents 5ba28be + 8a25418 commit 3c69140

2,918 files changed

Lines changed: 71363 additions & 48268 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.mailmap‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
337337
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
338338
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
339339
Kay Sievers <kay.sievers@vrfy.org>
340-
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
341-
Kees Cook <keescook@chromium.org> <keescook@google.com>
342-
Kees Cook <keescook@chromium.org> <kees@outflux.net>
343-
Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
340+
Kees Cook <kees@kernel.org> <kees.cook@canonical.com>
341+
Kees Cook <kees@kernel.org> <keescook@chromium.org>
342+
Kees Cook <kees@kernel.org> <keescook@google.com>
343+
Kees Cook <kees@kernel.org> <kees@outflux.net>
344+
Kees Cook <kees@kernel.org> <kees@ubuntu.com>
344345
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
345346
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
346347
Kenneth W Chen <kenneth.w.chen@intel.com>
@@ -572,7 +573,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
572573
Sascha Hauer <s.hauer@pengutronix.de>
573574
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
574575
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
575-
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
576+
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
576577
S.Çağlar Onur <caglar@pardus.org.tr>
577578
Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>
578579
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>

‎Documentation/ABI/stable/sysfs-bus-mhi‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,16 @@ Description: Initiates a SoC reset on the MHI controller. A SoC reset is
2929
This can be useful as a method of recovery if the device is
3030
non-responsive, or as a means of loading new firmware as a
3131
system administration task.
32+
33+
What: /sys/bus/mhi/devices/.../trigger_edl
34+
Date: April 2024
35+
KernelVersion: 6.10
36+
Contact: mhi@lists.linux.dev
37+
Description: Writing a non-zero value to this file will force devices to
38+
enter EDL (Emergency Download) mode. This entry only exists for
39+
devices capable of entering the EDL mode using the standard EDL
40+
triggering mechanism defined in the MHI spec v1.2. Once in EDL
41+
mode, the flash programmer image can be downloaded to the
42+
device to enter the flash programmer execution environment.
43+
This can be useful if user wants to use QDL (Qualcomm Download,
44+
which is used to download firmware over EDL) to update firmware.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Contact: Mathieu Poirier <mathieu.poirier@linaro.org>
2222
Description: (RW) Used in conjunction with @addr_idx. Specifies
2323
characteristics about the address comparator being configure,
2424
for example the access type, the kind of instruction to trace,
25-
processor contect ID to trigger on, etc. Individual fields in
25+
processor context ID to trigger on, etc. Individual fields in
2626
the access type register may vary on the version of the trace
2727
entity.
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Date: August 2023
9797
KernelVersion: 6.7
9898
Contact: Anshuman Khandual <anshuman.khandual@arm.com>
9999
Description: (Read) Shows all supported Coresight TMC-ETR buffer modes available
100-
for the users to configure explicitly. This file is avaialble only
100+
for the users to configure explicitly. This file is available only
101101
for TMC ETR devices.
102102

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ KernelVersion 6.9
244244
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
245245
Description:
246246
(RW) Read or write the status of timestamp upon all interface.
247-
Only value 0 and 1 can be written to this node. Set this node to 1 to requeset
247+
Only value 0 and 1 can be written to this node. Set this node to 1 to request
248248
timestamp to all trace packet.
249249
Accepts only one of the 2 values - 0 or 1.
250250
0 : Disable the timestamp of all trace packets.

‎Documentation/ABI/testing/sysfs-bus-event_source-devices-events‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ Description: Per-pmu performance monitoring events specific to the running syste
3737
performance monitoring event supported by the <pmu>. The name
3838
of the file is the name of the event.
3939

40+
As performance monitoring event names are case
41+
insensitive in the perf tool, the perf tool only looks
42+
for lower or upper case event names in sysfs to avoid
43+
scanning the directory. It is therefore required the
44+
name of the event here is either lower or upper case.
45+
4046
File contents:
4147

4248
<term>[=<value>][,<term>[=<value>]]...

Documentation/ABI/testing/sysfs-devices-hisi_ptt renamed to Documentation/ABI/testing/sysfs-bus-event_source-devices-hisi_ptt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune
1+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune
22
Date: October 2022
33
KernelVersion: 6.1
44
Contact: Yicong Yang <yangyicong@hisilicon.com>
@@ -8,7 +8,7 @@ Description: This directory contains files for tuning the PCIe link
88

99
See Documentation/trace/hisi-ptt.rst for more information.
1010

11-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_cpl
11+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_cpl
1212
Date: October 2022
1313
KernelVersion: 6.1
1414
Contact: Yicong Yang <yangyicong@hisilicon.com>
@@ -18,7 +18,7 @@ Description: (RW) Controls the weight of Tx completion TLPs, which influence
1818
will return an error, and out of range values will be converted
1919
to 2. The value indicates a probable level of the event.
2020

21-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_np
21+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_np
2222
Date: October 2022
2323
KernelVersion: 6.1
2424
Contact: Yicong Yang <yangyicong@hisilicon.com>
@@ -28,7 +28,7 @@ Description: (RW) Controls the weight of Tx non-posted TLPs, which influence
2828
will return an error, and out of range values will be converted
2929
to 2. The value indicates a probable level of the event.
3030

31-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_p
31+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/qos_tx_p
3232
Date: October 2022
3333
KernelVersion: 6.1
3434
Contact: Yicong Yang <yangyicong@hisilicon.com>
@@ -38,7 +38,7 @@ Description: (RW) Controls the weight of Tx posted TLPs, which influence the
3838
will return an error, and out of range values will be converted
3939
to 2. The value indicates a probable level of the event.
4040

41-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/rx_alloc_buf_level
41+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/rx_alloc_buf_level
4242
Date: October 2022
4343
KernelVersion: 6.1
4444
Contact: Yicong Yang <yangyicong@hisilicon.com>
@@ -49,7 +49,7 @@ Description: (RW) Control the allocated buffer watermark for inbound packets.
4949
will return an error, and out of range values will be converted
5050
to 2. The value indicates a probable level of the event.
5151

52-
What: /sys/devices/hisi_ptt<sicl_id>_<core_id>/tune/tx_alloc_buf_level
52+
What: /sys/bus/event_source/devices/hisi_ptt<sicl_id>_<core_id>/tune/tx_alloc_buf_level
5353
Date: October 2022
5454
KernelVersion: 6.1
5555
Contact: Yicong Yang <yangyicong@hisilicon.com>

‎Documentation/ABI/testing/sysfs-bus-iio‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,8 @@ Description:
243243
less measurements. Units after application of scale and offset
244244
are milli degrees Celsius.
245245

246-
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_input
246+
What: /sys/bus/iio/devices/iio:deviceX/in_tempY_input
247+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_input
247248
KernelVersion: 2.6.38
248249
Contact: linux-iio@vger.kernel.org
249250
Description:

‎Documentation/ABI/testing/sysfs-bus-iio-ad9739a‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_operating_mode
2+
KernelVersion: 6.9
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
DAC operating mode. One of the following modes can be selected:
6+
7+
* normal: This is DAC normal mode.
8+
* mixed-mode: In this mode the output is effectively chopped at
9+
the DAC sample rate. This has the effect of
10+
reducing the power of the fundamental signal while
11+
increasing the power of the images centered around
12+
the DAC sample rate, thus improving the output
13+
power of these images.
14+
15+
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_operating_mode_available
16+
KernelVersion: 6.9
17+
Contact: linux-iio@vger.kernel.org
18+
Description:
19+
Available operating modes.

Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-hub renamed to Documentation/ABI/testing/sysfs-bus-platform-onboard-usb-dev

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ Contact: Matthias Kaehlcke <matthias@kaehlcke.net>
55
linux-usb@vger.kernel.org
66
Description:
77
(RW) Controls whether the USB hub remains always powered
8-
during system suspend or not.
8+
during system suspend or not. This attribute is not
9+
available for non-hub devices.

0 commit comments

Comments
 (0)