Skip to content

Commit b44a7f0

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

19,284 files changed

Lines changed: 1221336 additions & 502343 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: 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 <adurbin@google.com>
13+
Abhinav Kumar <quic_abhinavk@quicinc.com> <abhinavk@codeaurora.org>
1314
Adam Oldham <oldhamca@gmail.com>
1415
Adam Radford <aradford@gmail.com>
1516
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
1617
Adrian Bunk <bunk@stusta.de>
18+
Akhil P Oommen <quic_akhilpo@quicinc.com> <akhilpo@codeaurora.org>
1719
Alan Cox <alan@lxorguk.ukuu.org.uk>
1820
Alan Cox <root@hraefn.swansea.linux.org.uk>
1921
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
@@ -33,13 +35,16 @@ Al Viro <viro@zenIV.linux.org.uk>
3335
Andi Kleen <ak@linux.intel.com> <ak@suse.de>
3436
Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
3537
Andreas Herrmann <aherrman@de.ibm.com>
38+
Andrej Shadura <andrew.shadura@collabora.co.uk>
39+
Andrej Shadura <andrew@shadura.me> <andrew@beldisplaytech.com>
3640
Andrew Morton <akpm@linux-foundation.org>
3741
Andrew Murray <amurray@thegoodpenguin.co.uk> <amurray@embedded-bits.co.uk>
3842
Andrew Murray <amurray@thegoodpenguin.co.uk> <andrew.murray@arm.com>
3943
Andrew Vasquez <andrew.vasquez@qlogic.com>
4044
Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
4145
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4246
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
47+
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
4348
Andy Adamson <andros@citi.umich.edu>
4449
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
4550
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
@@ -69,8 +74,13 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
6974
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
7075
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
7176
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
77+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
78+
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
79+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
7280
Christophe Ricard <christophe.ricard@gmail.com>
7381
Christoph Hellwig <hch@lst.de>
82+
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
83+
Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
7484
Corey Minyard <minyard@acm.org>
7585
Damian Hobson-Garcia <dhobsong@igel.co.jp>
7686
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -98,6 +108,7 @@ Douglas Gilbert <dougg@torque.net>
98108
Ed L. Cashin <ecashin@coraid.com>
99109
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
100110
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
111+
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
101112
Felipe W Damasio <felipewd@terra.com.br>
102113
Felix Kuhling <fxkuehl@gmx.de>
103114
Felix Moeller <felix@derklecks.de>
@@ -118,6 +129,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
118129
Greg Kroah-Hartman <greg@kroah.com>
119130
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
120131
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
132+
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
133+
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
121134
Gustavo Padovan <gustavo@las.ic.unicamp.br>
122135
Gustavo Padovan <padovan@profusion.mobi>
123136
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
@@ -162,6 +175,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
162175
Jens Axboe <axboe@suse.de>
163176
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
164177
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
178+
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
165179
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
166180
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
167181
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -181,6 +195,7 @@ Juha Yrjola <at solidboot.com>
181195
Juha Yrjola <juha.yrjola@nokia.com>
182196
Juha Yrjola <juha.yrjola@solidboot.com>
183197
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
198+
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
184199
Kay Sievers <kay.sievers@vrfy.org>
185200
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
186201
Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -192,9 +207,11 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
192207
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
193208
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
194209
Koushik <raghavendra.koushik@neterion.com>
210+
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
195211
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
196212
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
197213
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
214+
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
198215
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
199216
Leonid I Ananiev <leonid.i.ananiev@intel.com>
200217
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@ -276,6 +293,7 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
276293
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
277294
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
278295
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
296+
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
279297
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
280298
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
281299
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
@@ -300,6 +318,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
300318
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
301319
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
302320
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
321+
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
303322
Rajesh Shah <rajesh.shah@intel.com>
304323
Ralf Baechle <ralf@linux-mips.org>
305324
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -314,6 +333,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt>
314333
Sachin P Sant <ssant@in.ibm.com>
315334
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
316335
Sam Ravnborg <sam@mars.ravnborg.org>
336+
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
317337
Santosh Shilimkar <santosh.shilimkar@oracle.org>
318338
Santosh Shilimkar <ssantosh@kernel.org>
319339
Sarangdhar Joshi <spjoshi@codeaurora.org>

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
E: dsd@gentoo.org
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+
Contact: ocfs2-devel@oss.oracle.com
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+
ocfs2-devel@oss.oracle.com.

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
Contact: ocfs2-devel@oss.oracle.com

0 commit comments

Comments
 (0)