Skip to content

Commit 1136fa0

Browse files
committed
Merge tag 'v5.17-rc4' into for-linus
Merge with mainline to get the Intel ASoC generic helpers header and other changes.
2 parents ba115ad + 754e0b0 commit 1136fa0

18,638 files changed

Lines changed: 1153225 additions & 483581 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: 24 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>
@@ -42,14 +44,17 @@ Andrew Vasquez <andrew.vasquez@qlogic.com>
4244
Andrey Konovalov <andreyknvl@gmail.com> <andreyknvl@google.com>
4345
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
4446
Andrey Ryabinin <ryabinin.a.a@gmail.com> <aryabinin@virtuozzo.com>
47+
Andrzej Hajda <andrzej.hajda@intel.com> <a.hajda@samsung.com>
4548
Andy Adamson <andros@citi.umich.edu>
4649
Antoine Tenart <atenart@kernel.org> <antoine.tenart@bootlin.com>
4750
Antoine Tenart <atenart@kernel.org> <antoine.tenart@free-electrons.com>
4851
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
52+
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
4953
Archit Taneja <archit@ti.com>
5054
Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
5155
Arnaud Patard <arnaud.patard@rtp-net.org>
5256
Arnd Bergmann <arnd@arndb.de>
57+
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
5358
Axel Dyks <xl@xlsigned.net>
5459
Axel Lin <axel.lin@gmail.com>
5560
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
@@ -65,14 +70,23 @@ Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
6570
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
6671
Brian Avery <b.avery@hp.com>
6772
Brian King <brking@us.ibm.com>
73+
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
6874
Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
6975
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
7076
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
7177
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
7278
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
7379
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
80+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
81+
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
82+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
83+
Christian Brauner <brauner@kernel.org> <christian@brauner.io>
84+
Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
85+
Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
7486
Christophe Ricard <christophe.ricard@gmail.com>
7587
Christoph Hellwig <hch@lst.de>
88+
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
89+
Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
7690
Corey Minyard <minyard@acm.org>
7791
Damian Hobson-Garcia <dhobsong@igel.co.jp>
7892
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
@@ -100,6 +114,7 @@ Douglas Gilbert <dougg@torque.net>
100114
Ed L. Cashin <ecashin@coraid.com>
101115
Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>
102116
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
117+
Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>
103118
Felipe W Damasio <felipewd@terra.com.br>
104119
Felix Kuhling <fxkuehl@gmx.de>
105120
Felix Moeller <felix@derklecks.de>
@@ -120,6 +135,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
120135
Greg Kroah-Hartman <greg@kroah.com>
121136
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
122137
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
138+
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
139+
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
123140
Gustavo Padovan <gustavo@las.ic.unicamp.br>
124141
Gustavo Padovan <padovan@profusion.mobi>
125142
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
@@ -164,6 +181,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
164181
Jens Axboe <axboe@suse.de>
165182
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
166183
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
184+
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
167185
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
168186
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
169187
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -183,6 +201,7 @@ Juha Yrjola <at solidboot.com>
183201
Juha Yrjola <juha.yrjola@nokia.com>
184202
Juha Yrjola <juha.yrjola@solidboot.com>
185203
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
204+
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
186205
Kay Sievers <kay.sievers@vrfy.org>
187206
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
188207
Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -194,9 +213,11 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
194213
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
195214
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
196215
Koushik <raghavendra.koushik@neterion.com>
216+
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
197217
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
198218
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
199219
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
220+
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
200221
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
201222
Leonid I Ananiev <leonid.i.ananiev@intel.com>
202223
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@ -278,6 +299,7 @@ Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
278299
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
279300
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
280301
Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
302+
Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
281303
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
282304
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
283305
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
@@ -302,6 +324,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
302324
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
303325
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
304326
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
327+
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
305328
Rajesh Shah <rajesh.shah@intel.com>
306329
Ralf Baechle <ralf@linux-mips.org>
307330
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -316,6 +339,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt>
316339
Sachin P Sant <ssant@in.ibm.com>
317340
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
318341
Sam Ravnborg <sam@mars.ravnborg.org>
342+
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
319343
Santosh Shilimkar <santosh.shilimkar@oracle.org>
320344
Santosh Shilimkar <ssantosh@kernel.org>
321345
Sarangdhar Joshi <spjoshi@codeaurora.org>

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,11 @@ S: Via Delle Palme, 9
315315
S: Terni 05100
316316
S: Italy
317317

318+
N: Ohad Ben Cohen
319+
E: ohad@wizery.com
320+
D: Remote Processor (remoteproc) subsystem
321+
D: Remote Processor Messaging (rpmsg) subsystem
322+
318323
N: Krzysztof Benedyczak
319324
E: golbi@mat.uni.torun.pl
320325
W: http://www.mat.uni.torun.pl/~golbi

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)