Skip to content

Commit 3eb66e9

Browse files
committed
Merge tag 'v4.20' into for-linus
Sync with mainline to get linux/overflow.h among other things.
2 parents 4add635 + 8fe28cb commit 3eb66e9

File tree

24,798 files changed

+1696439
-1122469
lines changed

Some content is hidden

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

24,798 files changed

+1696439
-1122469
lines changed

.clang-format

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,6 @@ ForEachMacros:
323323
- 'protocol_for_each_card'
324324
- 'protocol_for_each_dev'
325325
- 'queue_for_each_hw_ctx'
326-
- 'radix_tree_for_each_contig'
327326
- 'radix_tree_for_each_slot'
328327
- 'radix_tree_for_each_tagged'
329328
- 'rbtree_postorder_for_each_entry_safe'
@@ -382,7 +381,7 @@ IncludeIsMainRegex: '(Test)?$'
382381
IndentCaseLabels: false
383382
#IndentPPDirectives: None # Unknown to clang-format-5.0
384383
IndentWidth: 8
385-
IndentWrappedFunctionNames: true
384+
IndentWrappedFunctionNames: false
386385
JavaScriptQuotes: Leave
387386
JavaScriptWrapImports: true
388387
KeepEmptyLinesAtTheStartOfBlocks: false

.mailmap

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Arnaud Patard <[email protected]>
3131
Arnd Bergmann <[email protected]>
3232
Axel Dyks <[email protected]>
3333
34+
35+
3436
Ben Gardner <[email protected]>
3537
Ben M Cahill <[email protected]>
3638
Björn Steinbrink <[email protected]>
@@ -81,6 +83,9 @@ Javi Merino <[email protected]> <[email protected]>
8183
8284
Jean Tourrilhes <[email protected]>
8385
Jeff Garzik <[email protected]>
86+
87+
88+
8489
Jens Axboe <[email protected]>
8590
Jens Osterkamp <[email protected]>
8691
@@ -114,6 +119,13 @@ Mark Brown <[email protected]>
114119
115120
116121
122+
123+
124+
125+
126+
127+
128+
117129
Matthieu CASTET <[email protected]>
118130
Mauro Carvalho Chehab <[email protected]> <[email protected]>
119131
Mauro Carvalho Chehab <[email protected]> <[email protected]>
@@ -147,13 +159,20 @@ Peter Oruba <[email protected]>
147159
Peter Oruba <[email protected]>
148160
149161
Praveen BP <[email protected]>
162+
150163
164+
165+
166+
167+
168+
151169
Rajesh Shah <[email protected]>
152170
Ralf Baechle <[email protected]>
153171
Ralf Wildenhues <[email protected]>
154172
155173
Rémi Denis-Courmont <[email protected]>
156174
Ricardo Ribalda Delgado <[email protected]>
175+
157176
Rudolf Marek <[email protected]>
158177
Rui Saraiva <[email protected]>
159178
Sachin P Sant <[email protected]>
@@ -186,6 +205,9 @@ Uwe Kleine-König <[email protected]>
186205
Uwe Kleine-König <[email protected]>
187206
Uwe Kleine-König <[email protected]>
188207
Valdis Kletnieks <[email protected]>
208+
209+
210+
189211
190212
191213

CREDITS

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,6 +2138,10 @@ E: [email protected]
21382138
D: Soundblaster driver fixes, ISAPnP quirk
21392139
S: California, USA
21402140

2141+
N: Jarkko Lavinen
2142+
2143+
D: OMAP MMC support
2144+
21412145
N: Jonathan Layes
21422146
D: ARPD support
21432147

@@ -2200,6 +2204,10 @@ S: Post Office Box 371
22002204
S: North Little Rock, Arkansas 72115
22012205
S: USA
22022206

2207+
N: Christopher Li
2208+
2209+
D: Sparse maintainer 2009 - 2018
2210+
22032211
N: Stephan Linz
22042212
22052213
@@ -2533,6 +2541,10 @@ S: Ormond
25332541
S: Victoria 3163
25342542
S: Australia
25352543

2544+
N: Eric Miao
2545+
2546+
D: MMP support
2547+
25362548
N: Pauline Middelink
25372549
25382550
D: General low-level bug fixes, /proc fixes, identd support
@@ -2571,6 +2583,11 @@ S: Helstorfer Str. 7
25712583
S: D-30625 Hannover
25722584
S: Germany
25732585

2586+
N: Ron Minnich
2587+
2588+
2589+
D: 9p filesystem development
2590+
25742591
N: Corey Minyard
25752592
25762593
@@ -4102,6 +4119,10 @@ S: 1507 145th Place SE #B5
41024119
S: Bellevue, Washington 98007
41034120
S: USA
41044121

4122+
N: Haojian Zhuang
4123+
4124+
D: MMP support
4125+
41054126
N: Richard Zidlicky
41064127
41074128
W: http://www.geocities.com/rdzidlic

0 commit comments

Comments
 (0)