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 <[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]>
@@ -42,14 +44,17 @@ Andrew Vasquez <[email protected]>
4244
4345
4446
47+
4548
Andy Adamson <[email protected]>
4649
4750
4851
52+
4953
Archit Taneja <[email protected]>
5054
5155
Arnaud Patard <[email protected]>
5256
Arnd Bergmann <[email protected]>
57+
5358
Axel Dyks <[email protected]>
5459
5560
@@ -71,6 +76,9 @@ Chao Yu <[email protected]> <[email protected]>
7176
7277
7378
79+
Christian Borntraeger <[email protected]> <[email protected]>
80+
Christian Borntraeger <[email protected]> <[email protected]>
81+
Christian Borntraeger <[email protected]> <[email protected]>
7482
Christophe Ricard <[email protected]>
7583
Christoph Hellwig <[email protected]>
7684
@@ -123,6 +131,8 @@ Greg Kroah-Hartman <[email protected]>
123131
Greg Kroah-Hartman <[email protected]>
124132
125133
134+
135+
126136
Gustavo Padovan <[email protected]>
127137
Gustavo Padovan <[email protected]>
128138
@@ -167,6 +177,7 @@ Jeff Layton <[email protected]> <[email protected]>
167177
Jens Axboe <[email protected]>
168178
Jens Osterkamp <[email protected]>
169179
180+
170181
171182
172183
@@ -186,6 +197,7 @@ Juha Yrjola <at solidboot.com>
186197
Juha Yrjola <[email protected]>
187198
Juha Yrjola <[email protected]>
188199
200+
189201
Kay Sievers <[email protected]>
190202
191203
@@ -197,9 +209,11 @@ Kenneth W Chen <[email protected]>
197209
Konstantin Khlebnikov <[email protected]> <[email protected]>
198210
Konstantin Khlebnikov <[email protected]> <[email protected]>
199211
212+
Krishna Manikandan <[email protected]> <[email protected]>
200213
Krzysztof Kozlowski <[email protected]> <[email protected]>
201214
Krzysztof Kozlowski <[email protected]> <[email protected]>
202215
Kuninori Morimoto <[email protected]>
216+
203217
204218
Leonid I Ananiev <[email protected]>
205219
@@ -306,6 +320,7 @@ Qais Yousef <[email protected]> <[email protected]>
306320
307321
308322
323+
309324
Rajesh Shah <[email protected]>
310325
Ralf Baechle <[email protected]>
311326
Ralf Wildenhues <[email protected]>
@@ -320,6 +335,7 @@ Rui Saraiva <[email protected]>
320335
Sachin P Sant <[email protected]>
321336
322337
Sam Ravnborg <[email protected]>
338+
Sankeerth Billakanti <[email protected]> <[email protected]>
323339
Santosh Shilimkar <[email protected]>
324340
Santosh Shilimkar <[email protected]>
325341
Sarangdhar Joshi <[email protected]>

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+
320+
D: Remote Processor (remoteproc) subsystem
321+
D: Remote Processor Messaging (rpmsg) subsystem
322+
318323
N: Krzysztof Benedyczak
319324
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)