Skip to content

Commit b44a7f0

Browse files
committed
Merge branch 'for-5.18/selftests-fixes' into for-next
2 parents 32fdbc4 + 4327b9e commit b44a7f0

File tree

19,284 files changed

+1221336
-502343
lines changed

Some content is hidden

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

19,284 files changed

+1221336
-502343
lines changed

.clang-format

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ ForEachMacros:
216216
- 'for_each_migratetype_order'
217217
- 'for_each_msi_entry'
218218
- 'for_each_msi_entry_safe'
219-
- 'for_each_msi_vector'
220219
- 'for_each_net'
221220
- 'for_each_net_continue_reverse'
222221
- 'for_each_netdev'

.mailmap

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
# Please keep this list dictionary sorted.
1111
#
1212
Aaron Durbin <[email protected]>
13+
1314
Adam Oldham <[email protected]>
1415
Adam Radford <[email protected]>
1516
1617
Adrian Bunk <[email protected]>
18+
1719
1820
1921
Aleksandar Markovic <[email protected]> <[email protected]>
@@ -33,13 +35,16 @@ Al Viro <[email protected]>
3335
3436
3537
Andreas Herrmann <[email protected]>
38+
Andrej Shadura <[email protected]>
39+
3640
Andrew Morton <[email protected]>
3741
3842
3943
Andrew Vasquez <[email protected]>
4044
4145
4246
47+
4348
Andy Adamson <[email protected]>
4449
4550
@@ -69,8 +74,13 @@ Chao Yu <[email protected]> <[email protected]>
6974
7075
7176
77+
Christian Borntraeger <[email protected]> <[email protected]>
78+
Christian Borntraeger <[email protected]> <[email protected]>
79+
Christian Borntraeger <[email protected]> <[email protected]>
7280
Christophe Ricard <[email protected]>
7381
Christoph Hellwig <[email protected]>
82+
83+
7484
Corey Minyard <[email protected]>
7585
Damian Hobson-Garcia <[email protected]>
7686
@@ -98,6 +108,7 @@ Douglas Gilbert <[email protected]>
98108
Ed L. Cashin <[email protected]>
99109
100110
Evgeniy Polyakov <[email protected]>
111+
101112
Felipe W Damasio <[email protected]>
102113
Felix Kuhling <[email protected]>
103114
Felix Moeller <[email protected]>
@@ -118,6 +129,8 @@ Greg Kroah-Hartman <[email protected]>
118129
Greg Kroah-Hartman <[email protected]>
119130
120131
132+
133+
121134
Gustavo Padovan <[email protected]>
122135
Gustavo Padovan <[email protected]>
123136
@@ -162,6 +175,7 @@ Jeff Layton <[email protected]> <[email protected]>
162175
Jens Axboe <[email protected]>
163176
Jens Osterkamp <[email protected]>
164177
178+
165179
166180
167181
@@ -181,6 +195,7 @@ Juha Yrjola <at solidboot.com>
181195
Juha Yrjola <[email protected]>
182196
Juha Yrjola <[email protected]>
183197
198+
184199
Kay Sievers <[email protected]>
185200
186201
@@ -192,9 +207,11 @@ Kenneth W Chen <[email protected]>
192207
Konstantin Khlebnikov <[email protected]> <[email protected]>
193208
Konstantin Khlebnikov <[email protected]> <[email protected]>
194209
210+
Krishna Manikandan <[email protected]> <[email protected]>
195211
Krzysztof Kozlowski <[email protected]> <[email protected]>
196212
Krzysztof Kozlowski <[email protected]> <[email protected]>
197213
Kuninori Morimoto <[email protected]>
214+
198215
199216
Leonid I Ananiev <[email protected]>
200217
@@ -276,6 +293,7 @@ Nicolas Pitre <[email protected]> <[email protected]>
276293
277294
Nicolas Saenz Julienne <[email protected]> <[email protected]>
278295
Nicolas Saenz Julienne <[email protected]> <[email protected]>
296+
Niklas Söderlund <[email protected]>
279297
280298
281299
@@ -300,6 +318,7 @@ Qais Yousef <[email protected]> <[email protected]>
300318
301319
302320
321+
303322
Rajesh Shah <[email protected]>
304323
Ralf Baechle <[email protected]>
305324
Ralf Wildenhues <[email protected]>
@@ -314,6 +333,7 @@ Rui Saraiva <[email protected]>
314333
Sachin P Sant <[email protected]>
315334
316335
Sam Ravnborg <[email protected]>
336+
Sankeerth Billakanti <[email protected]> <[email protected]>
317337
Santosh Shilimkar <[email protected]>
318338
Santosh Shilimkar <[email protected]>
319339
Sarangdhar Joshi <[email protected]>

CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -971,6 +971,7 @@ D: PowerPC
971971
N: Daniel Drake
972972
973973
D: USBAT02 CompactFlash support in usb-storage
974+
D: ZD1211RW wireless driver
974975
S: UK
975976

976977
N: Oleg Drokin

Documentation/ABI/obsolete/o2cb

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
What: /sys/o2cb
2+
Date: Dec 2005
3+
KernelVersion: 2.6.16
4+
5+
Description: Ocfs2-tools looks at 'interface-revision' for versioning
6+
information. Each logmask/ file controls a set of debug prints
7+
and can be written into with the strings "allow", "deny", or
8+
"off". Reading the file returns the current state.
9+
Was renamed to /sys/fs/u2cb/
10+
Users: ocfs2-tools. It's sufficient to mail proposed changes to
11+

Documentation/ABI/obsolete/sysfs-bus-iio

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Description:
66

77
Since Kernel 5.11, multiple buffers are supported.
88
so, it is better to use, instead:
9+
910
/sys/bus/iio/devices/iio:deviceX/bufferY/length
1011

1112
What: /sys/bus/iio/devices/iio:deviceX/buffer/enable
@@ -17,6 +18,7 @@ Description:
1718

1819
Since Kernel 5.11, multiple buffers are supported.
1920
so, it is better to use, instead:
21+
2022
/sys/bus/iio/devices/iio:deviceX/bufferY/enable
2123

2224
What: /sys/bus/iio/devices/iio:deviceX/scan_elements
@@ -165,6 +167,7 @@ Description:
165167

166168
Since Kernel 5.11, multiple buffers are supported.
167169
so, it is better to use, instead:
170+
168171
/sys/bus/iio/devices/iio:deviceX/bufferY/watermark
169172

170173
What: /sys/bus/iio/devices/iio:deviceX/buffer/data_available
@@ -179,4 +182,5 @@ Description:
179182

180183
Since Kernel 5.11, multiple buffers are supported.
181184
so, it is better to use, instead:
185+
182186
/sys/bus/iio/devices/iio:deviceX/bufferY/data_available

Documentation/ABI/obsolete/sysfs-class-dax

Lines changed: 0 additions & 22 deletions
This file was deleted.

Documentation/ABI/stable/o2cb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/fs/o2cb/ (was /sys/o2cb)
1+
What: /sys/fs/o2cb/
22
Date: Dec 2005
33
KernelVersion: 2.6.16
44

0 commit comments

Comments
 (0)