Skip to content

Commit de4fb17

Browse files
author
Russell King (Oracle)
committed
Merge branches 'fixes' and 'misc' into for-linus
2 parents 9be4c88 + 9c6d665 commit de4fb17

File tree

11,385 files changed

+501936
-249806
lines changed

Some content is hidden

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

11,385 files changed

+501936
-249806
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: 16 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>
@@ -71,6 +76,9 @@ Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
7176
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
7277
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
7378
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
79+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
80+
Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
81+
Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
7482
Christophe Ricard <christophe.ricard@gmail.com>
7583
Christoph Hellwig <hch@lst.de>
7684
Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
@@ -123,6 +131,8 @@ Greg Kroah-Hartman <gregkh@suse.de>
123131
Greg Kroah-Hartman <greg@kroah.com>
124132
Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>
125133
Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
134+
Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>
135+
Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>
126136
Gustavo Padovan <gustavo@las.ic.unicamp.br>
127137
Gustavo Padovan <padovan@profusion.mobi>
128138
Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
@@ -167,6 +177,7 @@ Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
167177
Jens Axboe <axboe@suse.de>
168178
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
169179
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
180+
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
170181
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
171182
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
172183
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>
@@ -186,6 +197,7 @@ Juha Yrjola <at solidboot.com>
186197
Juha Yrjola <juha.yrjola@nokia.com>
187198
Juha Yrjola <juha.yrjola@solidboot.com>
188199
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
200+
Kalyan Thota <quic_kalyant@quicinc.com> <kalyan_t@codeaurora.org>
189201
Kay Sievers <kay.sievers@vrfy.org>
190202
Kees Cook <keescook@chromium.org> <kees.cook@canonical.com>
191203
Kees Cook <keescook@chromium.org> <keescook@google.com>
@@ -197,9 +209,11 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
197209
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
198210
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
199211
Koushik <raghavendra.koushik@neterion.com>
212+
Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
200213
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
201214
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
202215
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
216+
Kuogee Hsieh <quic_khsieh@quicinc.com> <khsieh@codeaurora.org>
203217
Leonardo Bras <leobras.c@gmail.com> <leonardo@linux.ibm.com>
204218
Leonid I Ananiev <leonid.i.ananiev@intel.com>
205219
Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
@@ -306,6 +320,7 @@ Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
306320
Quentin Monnet <quentin@isovalent.com> <quentin.monnet@netronome.com>
307321
Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
308322
Rafael J. Wysocki <rjw@rjwysocki.net> <rjw@sisk.pl>
323+
Rajeev Nandan <quic_rajeevny@quicinc.com> <rajeevny@codeaurora.org>
309324
Rajesh Shah <rajesh.shah@intel.com>
310325
Ralf Baechle <ralf@linux-mips.org>
311326
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
@@ -320,6 +335,7 @@ Rui Saraiva <rmps@joel.ist.utl.pt>
320335
Sachin P Sant <ssant@in.ibm.com>
321336
Sakari Ailus <sakari.ailus@linux.intel.com> <sakari.ailus@iki.fi>
322337
Sam Ravnborg <sam@mars.ravnborg.org>
338+
Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
323339
Santosh Shilimkar <santosh.shilimkar@oracle.org>
324340
Santosh Shilimkar <ssantosh@kernel.org>
325341
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/sysfs-class-dax

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

0 commit comments

Comments
 (0)