Skip to content

Commit 3daee2e

Browse files
committed
Merge tag 'v6.10' into next
Sync up with mainline to bring in device_for_each_child_node_scoped() and other newer APIs.
2 parents f3efefb + 0c38364 commit 3daee2e

File tree

12,371 files changed

+524358
-289355
lines changed

Some content is hidden

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

12,371 files changed

+524358
-289355
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ root = true
55
[{*.{awk,c,dts,dtsi,dtso,h,mk,s,S},Kconfig,Makefile,Makefile.*}]
66
charset = utf-8
77
end_of_line = lf
8-
trim_trailing_whitespace = true
98
insert_final_newline = true
109
indent_style = tab
1110
indent_size = 8
1211

1312
[*.{json,py,rs}]
1413
charset = utf-8
1514
end_of_line = lf
16-
trim_trailing_whitespace = true
1715
insert_final_newline = true
1816
indent_style = space
1917
indent_size = 4
@@ -26,7 +24,6 @@ indent_size = 8
2624
[*.yaml]
2725
charset = utf-8
2826
end_of_line = lf
29-
trim_trailing_whitespace = unset
3027
insert_final_newline = true
3128
indent_style = space
3229
indent_size = 2

.mailmap

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
7272
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
7373
André Almeida <andrealmeid@igalia.com> <andrealmeid@collabora.com>
7474
Andy Adamson <andros@citi.umich.edu>
75+
Andy Shevchenko <andy@kernel.org> <andy@smile.org.ua>
76+
Andy Shevchenko <andy@kernel.org> <ext-andriy.shevchenko@nokia.com>
7577
Anilkumar Kolli <quic_akolli@quicinc.com> <akolli@codeaurora.org>
7678
Anirudh Ghayal <quic_aghayal@quicinc.com> <aghayal@codeaurora.org>
7779
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
@@ -133,6 +135,7 @@ Bryan Tan <bryan-bt.tan@broadcom.com> <bryantan@vmware.com>
133135
Cai Huoqing <cai.huoqing@linux.dev> <caihuoqing@baidu.com>
134136
Can Guo <quic_cang@quicinc.com> <cang@codeaurora.org>
135137
Carl Huang <quic_cjhuang@quicinc.com> <cjhuang@codeaurora.org>
138+
Carlos Bilbao <carlos.bilbao.osdev@gmail.com> <carlos.bilbao@amd.com>
136139
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
137140
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
138141
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
@@ -216,6 +219,7 @@ Geliang Tang <geliang@kernel.org> <geliang.tang@suse.com>
216219
Geliang Tang <geliang@kernel.org> <geliangtang@xiaomi.com>
217220
Geliang Tang <geliang@kernel.org> <geliangtang@gmail.com>
218221
Geliang Tang <geliang@kernel.org> <geliangtang@163.com>
222+
Geliang Tang <geliang@kernel.org> <tanggeliang@kylinos.cn>
219223
Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>
220224
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
221225
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
@@ -336,10 +340,11 @@ Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
336340
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> <periyasa@codeaurora.org>
337341
Kathiravan T <quic_kathirav@quicinc.com> <kathirav@codeaurora.org>
338342
Kay Sievers <kay.sievers@vrfy.org>
339-
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
340-
Kees Cook <keescook@chromium.org> <keescook@google.com>
341-
Kees Cook <keescook@chromium.org> <kees@outflux.net>
342-
Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
343+
Kees Cook <kees@kernel.org> <kees.cook@canonical.com>
344+
Kees Cook <kees@kernel.org> <keescook@chromium.org>
345+
Kees Cook <kees@kernel.org> <keescook@google.com>
346+
Kees Cook <kees@kernel.org> <kees@outflux.net>
347+
Kees Cook <kees@kernel.org> <kees@ubuntu.com>
343348
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
344349
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
345350
Kenneth W Chen <kenneth.w.chen@intel.com>
@@ -379,6 +384,7 @@ Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
379384
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
380385
Lior David <quic_liord@quicinc.com> <liord@codeaurora.org>
381386
Lorenzo Pieralisi <lpieralisi@kernel.org> <lorenzo.pieralisi@arm.com>
387+
Lorenzo Stoakes <lorenzo.stoakes@oracle.com> <lstoakes@gmail.com>
382388
Luca Ceresoli <luca.ceresoli@bootlin.com> <luca@lucaceresoli.net>
383389
Lukasz Luba <lukasz.luba@arm.com> <l.luba@partner.samsung.com>
384390
Luo Jie <quic_luoj@quicinc.com> <luoj@codeaurora.org>
@@ -467,7 +473,8 @@ Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy
467473
Naoya Horiguchi <nao.horiguchi@gmail.com> <n-horiguchi@ah.jp.nec.com>
468474
Naoya Horiguchi <nao.horiguchi@gmail.com> <naoya.horiguchi@nec.com>
469475
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
470-
Neeraj Upadhyay <quic_neeraju@quicinc.com> <neeraju@codeaurora.org>
476+
Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <quic_neeraju@quicinc.com>
477+
Neeraj Upadhyay <neeraj.upadhyay@kernel.org> <neeraju@codeaurora.org>
471478
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
472479
Nguyen Anh Quynh <aquynh@gmail.com>
473480
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
@@ -570,7 +577,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
570577
Sascha Hauer <s.hauer@pengutronix.de>
571578
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
572579
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
573-
Satya Priya <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
580+
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
574581
S.Çağlar Onur <caglar@pardus.org.tr>
575582
Sayali Lokhande <quic_sayalil@quicinc.com> <sayalil@codeaurora.org>
576583
Sean Christopherson <seanjc@google.com> <sean.j.christopherson@intel.com>
@@ -602,6 +609,7 @@ Simon Kelley <simon@thekelleys.org.uk>
602609
Sricharan Ramabadhran <quic_srichara@quicinc.com> <sricharan@codeaurora.org>
603610
Srinivas Ramana <quic_sramana@quicinc.com> <sramana@codeaurora.org>
604611
Sriram R <quic_srirrama@quicinc.com> <srirrama@codeaurora.org>
612+
Stanislav Fomichev <sdf@fomichev.me> <sdf@google.com>
605613
Stefan Wahren <wahrenst@gmx.net> <stefan.wahren@i2se.com>
606614
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
607615
Stephen Hemminger <stephen@networkplumber.org> <shemminger@linux-foundation.org>

CREDITS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1214,6 +1214,10 @@ D: UDF filesystem
12141214
S: (ask for current address)
12151215
S: USA
12161216

1217+
N: Larry Finger
1218+
E: Larry.Finger@lwfinger.net
1219+
D: Maintainer of wireless drivers, too many to list here
1220+
12171221
N: Jürgen Fischer
12181222
E: fischer@norbit.de
12191223
D: Author of Adaptec AHA-152x SCSI driver
@@ -3146,9 +3150,11 @@ S: Triftstra=DFe 55
31463150
S: 13353 Berlin
31473151
S: Germany
31483152

3149-
N: Gustavo Pimental
3153+
N: Gustavo Pimentel
31503154
E: gustavo.pimentel@synopsys.com
31513155
D: PCI driver for Synopsys DesignWare
3156+
D: Synopsys DesignWare eDMA driver
3157+
D: Synopsys DesignWare xData traffic generator
31523158

31533159
N: Emanuel Pirker
31543160
E: epirker@edu.uni-klu.ac.at
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
What: /sys/firmware/efi/vars
2+
Date: April 2004, removed March 2023
3+
Description:
4+
This directory exposed interfaces for interacting with
5+
EFI variables. For more information on EFI variables,
6+
see 'Variable Services' in the UEFI specification
7+
(section 7.2 in specification version 2.3 Errata D).
8+
9+
The 'efivars' sysfs interface was removed in March of 2023,
10+
after being considered deprecated no later than September
11+
of 2020. Its functionality has been replaced by the
12+
'efivarfs' filesystem.

Documentation/ABI/stable/sysfs-block

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,16 @@ Description:
101101
devices that support receiving integrity metadata.
102102

103103

104+
What: /sys/block/<disk>/partscan
105+
Date: May 2024
106+
Contact: Christoph Hellwig <hch@lst.de>
107+
Description:
108+
The /sys/block/<disk>/partscan files reports if partition
109+
scanning is enabled for the disk. It returns "1" if partition
110+
scanning is enabled, or "0" if not. The value type is a 32-bit
111+
unsigned integer, but only "0" and "1" are valid values.
112+
113+
104114
What: /sys/block/<disk>/<partition>/alignment_offset
105115
Date: April 2009
106116
Contact: Martin K. Petersen <martin.petersen@oracle.com>
@@ -584,18 +594,6 @@ Description:
584594
the data. If no such restriction exists, this file will contain
585595
'0'. This file is writable for testing purposes.
586596

587-
588-
What: /sys/block/<disk>/queue/throttle_sample_time
589-
Date: March 2017
590-
Contact: linux-block@vger.kernel.org
591-
Description:
592-
[RW] This is the time window that blk-throttle samples data, in
593-
millisecond. blk-throttle makes decision based on the
594-
samplings. Lower time means cgroups have more smooth throughput,
595-
but higher CPU overhead. This exists only when
596-
CONFIG_BLK_DEV_THROTTLING_LOW is enabled.
597-
598-
599597
What: /sys/block/<disk>/queue/virt_boundary_mask
600598
Date: April 2021
601599
Contact: linux-block@vger.kernel.org

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/stable/sysfs-firmware-efi-vars

Lines changed: 0 additions & 79 deletions
This file was deleted.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
What: /sys/kernel/debug/msi-wmi-platform-<wmi_device_name>/*
2+
Date: April 2024
3+
KernelVersion: 6.10
4+
Contact: Armin Wolf <W_Armin@gmx.de>
5+
Description:
6+
This file allows to execute the associated WMI method with the same name.
7+
8+
To start the execution, write a buffer containing the method arguments
9+
at file offset 0. Partial writes or writes at a different offset are not
10+
supported.
11+
12+
The buffer returned by the WMI method can then be read from the file.
13+
14+
See Documentation/wmi/devices/msi-wmi-platform.rst for details.

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

0 commit comments

Comments
 (0)