Skip to content

Commit 8cdf379

Browse files
committed
Merge branch 'for-5.17/fixes' into for-next
2 parents cd2d68f + 50a0f3f commit 8cdf379

21,710 files changed

Lines changed: 1828763 additions & 679781 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.

.clang-format

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ ForEachMacros:
109109
- 'css_for_each_child'
110110
- 'css_for_each_descendant_post'
111111
- 'css_for_each_descendant_pre'
112-
- 'cxl_for_each_cmd'
113112
- 'device_for_each_child_node'
113+
- 'displayid_iter_for_each'
114114
- 'dma_fence_chain_for_each'
115115
- 'do_for_each_ftrace_op'
116116
- 'drm_atomic_crtc_for_each_plane'
@@ -136,6 +136,7 @@ ForEachMacros:
136136
- 'drm_mm_for_each_node_in_range'
137137
- 'drm_mm_for_each_node_safe'
138138
- 'flow_action_for_each'
139+
- 'for_each_acpi_dev_match'
139140
- 'for_each_active_dev_scope'
140141
- 'for_each_active_drhd_unit'
141142
- 'for_each_active_iommu'
@@ -171,14 +172,14 @@ ForEachMacros:
171172
- 'for_each_dapm_widgets'
172173
- 'for_each_dev_addr'
173174
- 'for_each_dev_scope'
174-
- 'for_each_displayid_db'
175175
- 'for_each_dma_cap_mask'
176176
- 'for_each_dpcm_be'
177177
- 'for_each_dpcm_be_rollback'
178178
- 'for_each_dpcm_be_safe'
179179
- 'for_each_dpcm_fe'
180180
- 'for_each_drhd_unit'
181181
- 'for_each_dss_dev'
182+
- 'for_each_dtpm_table'
182183
- 'for_each_efi_memory_desc'
183184
- 'for_each_efi_memory_desc_in_map'
184185
- 'for_each_element'
@@ -215,6 +216,7 @@ ForEachMacros:
215216
- 'for_each_migratetype_order'
216217
- 'for_each_msi_entry'
217218
- 'for_each_msi_entry_safe'
219+
- 'for_each_msi_vector'
218220
- 'for_each_net'
219221
- 'for_each_net_continue_reverse'
220222
- 'for_each_netdev'
@@ -270,6 +272,12 @@ ForEachMacros:
270272
- 'for_each_prime_number_from'
271273
- 'for_each_process'
272274
- 'for_each_process_thread'
275+
- 'for_each_prop_codec_conf'
276+
- 'for_each_prop_dai_codec'
277+
- 'for_each_prop_dai_cpu'
278+
- 'for_each_prop_dlc_codecs'
279+
- 'for_each_prop_dlc_cpus'
280+
- 'for_each_prop_dlc_platforms'
273281
- 'for_each_property_of_node'
274282
- 'for_each_registered_fb'
275283
- 'for_each_requested_gpio'
@@ -430,6 +438,7 @@ ForEachMacros:
430438
- 'queue_for_each_hw_ctx'
431439
- 'radix_tree_for_each_slot'
432440
- 'radix_tree_for_each_tagged'
441+
- 'rb_for_each'
433442
- 'rbtree_postorder_for_each_entry_safe'
434443
- 'rdma_for_each_block'
435444
- 'rdma_for_each_port'

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@
4848
*.xz
4949
*.zst
5050
Module.symvers
51-
modules.builtin
5251
modules.order
5352

5453
#
5554
# Top-level generic files
5655
#
57-
/tags
58-
/TAGS
5956
/linux
57+
/modules-only.symvers
6058
/vmlinux
6159
/vmlinux.32
60+
/vmlinux.map
6261
/vmlinux.symvers
6362
/vmlinux-gdb.py
6463
/vmlinuz
6564
/System.map
6665
/Module.markers
66+
/modules.builtin
6767
/modules.builtin.modinfo
6868
/modules.nsdeps
6969

@@ -112,6 +112,10 @@ patches-*
112112
patches
113113
series
114114

115+
# ctags files
116+
tags
117+
TAGS
118+
115119
# cscope files
116120
cscope.*
117121
ncscope.*

.mailmap

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Felipe W Damasio <felipewd@terra.com.br>
102102
Felix Kuhling <fxkuehl@gmx.de>
103103
Felix Moeller <felix@derklecks.de>
104104
Filipe Lautert <filipe@icewall.org>
105+
Finn Thain <fthain@linux-m68k.org> <fthain@telegraphics.com.au>
105106
Franck Bui-Huu <vagabon.xyz@gmail.com>
106107
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
107108
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
@@ -160,6 +161,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
160161
Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
161162
Jens Axboe <axboe@suse.de>
162163
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
164+
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
163165
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
164166
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
165167
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -211,6 +213,8 @@ Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
211213
Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
212214
Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
213215
Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
216+
Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
217+
Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
214218
Mark Brown <broonie@sirena.org.uk>
215219
Mark Starovoytov <mstarovo@pm.me> <mstarovoitov@marvell.com>
216220
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
@@ -225,6 +229,7 @@ Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>
225229
Matthew Wilcox <willy@infradead.org> <willy@debian.org>
226230
Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
227231
Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
232+
Matthias Fuchs <socketcan@esd.eu> <matthias.fuchs@esd.eu>
228233
Matthieu CASTET <castet.matthieu@free.fr>
229234
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
230235
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
@@ -242,6 +247,9 @@ Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
242247
Mayuresh Janorkar <mayur@ti.com>
243248
Michael Buesch <m@bues.ch>
244249
Michel Dänzer <michel@tungstengraphics.com>
250+
Michel Lespinasse <michel@lespinasse.org>
251+
Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
252+
Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
245253
Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
246254
Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
247255
Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
@@ -334,6 +342,7 @@ Sumit Semwal <sumit.semwal@ti.com>
334342
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
335343
Tejun Heo <htejun@gmail.com>
336344
Thomas Graf <tgraf@suug.ch>
345+
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
337346
Thomas Pedersen <twp@codeaurora.org>
338347
Tiezhu Yang <yangtiezhu@loongson.cn> <kernelpatch@126.com>
339348
Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,6 +1874,11 @@ S: Krosenska' 543
18741874
S: 181 00 Praha 8
18751875
S: Czech Republic
18761876

1877+
N: Murali Karicheri
1878+
E: m-karicheri2@ti.com
1879+
D: Keystone NetCP driver
1880+
D: Keystone PCIe host controller driver
1881+
18771882
N: Jan "Yenya" Kasprzak
18781883
E: kas@fi.muni.cz
18791884
D: Author of the COSA/SRP sync serial board driver.
@@ -1933,6 +1938,9 @@ N: Kukjin Kim
19331938
E: kgene@kernel.org
19341939
D: Samsung S3C, S5P and Exynos ARM architectures
19351940

1941+
N: Milo Kim
1942+
D: TI LP855x, LP8727 and LP8788 drivers
1943+
19361944
N: Sangbeom Kim
19371945
E: sbkim73@samsung.com
19381946
D: Samsung SoC Audio (ASoC) drivers
Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/buffer/length
2+
KernelVersion: 2.6.35
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Number of scans contained by the buffer.
6+
7+
Since Kernel 5.11, multiple buffers are supported.
8+
so, it is better to use, instead:
9+
/sys/bus/iio/devices/iio:deviceX/bufferY/length
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
12+
KernelVersion: 2.6.35
13+
Contact: linux-iio@vger.kernel.org
14+
Description:
15+
Actually start the buffer capture up. Will start trigger
16+
if first device and appropriate.
17+
18+
Since Kernel 5.11, multiple buffers are supported.
19+
so, it is better to use, instead:
20+
/sys/bus/iio/devices/iio:deviceX/bufferY/enable
21+
22+
What: /sys/bus/iio/devices/iio:deviceX/scan_elements
23+
KernelVersion: 2.6.37
24+
Contact: linux-iio@vger.kernel.org
25+
Description:
26+
Directory containing interfaces for elements that will be
27+
captured for a single triggered sample set in the buffer.
28+
29+
Since kernel 5.11 the scan_elements attributes are merged into
30+
the bufferY directory, to be configurable per buffer.
31+
32+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_en
33+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_en
34+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_en
35+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_en
36+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_en
37+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en
38+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_en
39+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_en
40+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_en
41+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_en
42+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_en
43+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_en
44+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_en
45+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en
46+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en
47+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_en
48+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en
49+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_en
50+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_en
51+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_en
52+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_en
53+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_en
54+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en
55+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_en
56+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_en
57+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en
58+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_en
59+
KernelVersion: 2.6.37
60+
Contact: linux-iio@vger.kernel.org
61+
Description:
62+
Scan element control for triggered data capture.
63+
64+
Since kernel 5.11 the scan_elements attributes are merged into
65+
the bufferY directory, to be configurable per buffer.
66+
67+
What: /sys/.../iio:deviceX/scan_elements/in_accel_type
68+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_type
69+
What: /sys/.../iio:deviceX/scan_elements/in_magn_type
70+
What: /sys/.../iio:deviceX/scan_elements/in_incli_type
71+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_type
72+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_type
73+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type
74+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_type
75+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_type
76+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_type
77+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_type
78+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type
79+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_type
80+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_type
81+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type
82+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_type
83+
KernelVersion: 2.6.37
84+
Contact: linux-iio@vger.kernel.org
85+
Description:
86+
Description of the scan element data storage within the buffer
87+
and hence the form in which it is read from user-space.
88+
Form is [be|le]:[s|u]bits/storagebits[>>shift].
89+
be or le specifies big or little endian. s or u specifies if
90+
signed (2's complement) or unsigned. bits is the number of bits
91+
of data and storagebits is the space (after padding) that it
92+
occupies in the buffer. shift if specified, is the shift that
93+
needs to be applied prior to masking out unused bits. Some
94+
devices put their data in the middle of the transferred elements
95+
with additional information on both sides. Note that some
96+
devices will have additional information in the unused bits
97+
so to get a clean value, the bits value must be used to mask
98+
the buffer output value appropriately. The storagebits value
99+
also specifies the data alignment. So s48/64>>2 will be a
100+
signed 48 bit integer stored in a 64 bit location aligned to
101+
a 64 bit boundary. To obtain the clean value, shift right 2
102+
and apply a mask to zero the top 16 bits of the result.
103+
For other storage combinations this attribute will be extended
104+
appropriately.
105+
106+
Since kernel 5.11 the scan_elements attributes are merged into
107+
the bufferY directory, to be configurable per buffer.
108+
109+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_index
110+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index
111+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_i_index
112+
What: /sys/.../iio:deviceX/scan_elements/in_voltageY_q_index
113+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_i_index
114+
What: /sys/.../iio:deviceX/scan_elements/in_voltage_q_index
115+
What: /sys/.../iio:deviceX/scan_elements/in_accel_x_index
116+
What: /sys/.../iio:deviceX/scan_elements/in_accel_y_index
117+
What: /sys/.../iio:deviceX/scan_elements/in_accel_z_index
118+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_x_index
119+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_y_index
120+
What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index
121+
What: /sys/.../iio:deviceX/scan_elements/in_magn_x_index
122+
What: /sys/.../iio:deviceX/scan_elements/in_magn_y_index
123+
What: /sys/.../iio:deviceX/scan_elements/in_magn_z_index
124+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_index
125+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_index
126+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_magnetic_tilt_comp_index
127+
What: /sys/.../iio:deviceX/scan_elements/in_rot_from_north_true_tilt_comp_index
128+
What: /sys/.../iio:deviceX/scan_elements/in_incli_x_index
129+
What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index
130+
What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index
131+
What: /sys/.../iio:deviceX/scan_elements/in_pressureY_index
132+
What: /sys/.../iio:deviceX/scan_elements/in_pressure_index
133+
What: /sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index
134+
What: /sys/.../iio:deviceX/scan_elements/in_proximity_index
135+
KernelVersion: 2.6.37
136+
Description:
137+
A single positive integer specifying the position of this
138+
scan element in the buffer. Note these are not dependent on
139+
what is enabled and may not be contiguous. Thus for user-space
140+
to establish the full layout these must be used in conjunction
141+
with all _en attributes to establish which channels are present,
142+
and the relevant _type attributes to establish the data storage
143+
format.
144+
145+
Since kernel 5.11 the scan_elements attributes are merged into
146+
the bufferY directory, to be configurable per buffer.
147+
148+
What: /sys/bus/iio/devices/iio:deviceX/buffer/watermark
149+
KernelVersion: 4.2
150+
Contact: linux-iio@vger.kernel.org
151+
Description:
152+
A single positive integer specifying the maximum number of scan
153+
elements to wait for.
154+
155+
Poll will block until the watermark is reached.
156+
157+
Blocking read will wait until the minimum between the requested
158+
read amount or the low water mark is available.
159+
160+
Non-blocking read will retrieve the available samples from the
161+
buffer even if there are less samples then watermark level. This
162+
allows the application to block on poll with a timeout and read
163+
the available samples after the timeout expires and thus have a
164+
maximum delay guarantee.
165+
166+
Since Kernel 5.11, multiple buffers are supported.
167+
so, it is better to use, instead:
168+
/sys/bus/iio/devices/iio:deviceX/bufferY/watermark
169+
170+
What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
171+
KernelVersion: 4.16
172+
Contact: linux-iio@vger.kernel.org
173+
Description:
174+
A read-only value indicating the bytes of data available in the
175+
buffer. In the case of an output buffer, this indicates the
176+
amount of empty space available to write data to. In the case of
177+
an input buffer, this indicates the amount of data available for
178+
reading.
179+
180+
Since Kernel 5.11, multiple buffers are supported.
181+
so, it is better to use, instead:
182+
/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/class/dax/
22
Date: May, 2016
33
KernelVersion: v4.7
4-
Contact: linux-nvdimm@lists.01.org
4+
Contact: nvdimm@lists.linux.dev
55
Description: Device DAX is the device-centric analogue of Filesystem
66
DAX (CONFIG_FS_DAX). It allows memory ranges to be
77
allocated and mapped without need of an intervening file

Documentation/ABI/obsolete/sysfs-cpuidle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Description:
66
with the update that cpuidle governor can be changed at runtime in default,
77
both current_governor and current_governor_ro co-exist under
88
/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
9-
current_governor_ro obselete.
9+
current_governor_ro obsolete.

Documentation/ABI/obsolete/sysfs-kernel-fadump_registered

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.¬
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/registered.
22

33
What: /sys/kernel/fadump_registered
44
Date: Feb 2012

Documentation/ABI/obsolete/sysfs-kernel-fadump_release_mem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.¬
1+
This ABI is renamed and moved to a new location /sys/kernel/fadump/release_mem.
22

33
What: /sys/kernel/fadump_release_mem
44
Date: Feb 2012

Documentation/ABI/removed/sysfs-bus-nfit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/nd/devices/regionX/nfit/ecc_unit_size
22
Date: Aug, 2017
33
KernelVersion: v4.14 (Removed v4.18)
4-
Contact: linux-nvdimm@lists.01.org
4+
Contact: nvdimm@lists.linux.dev
55
Description:
66
(RO) Size of a write request to a DIMM that will not incur a
77
read-modify-write cycle at the memory controller.

0 commit comments

Comments
 (0)