merge 4.20

.clang-format

@@ -323,7 +323,6 @@ ForEachMacros:
   - 'protocol_for_each_card'
   - 'protocol_for_each_dev'
   - 'queue_for_each_hw_ctx'
-  - 'radix_tree_for_each_contig'
   - 'radix_tree_for_each_slot'
   - 'radix_tree_for_each_tagged'
   - 'rbtree_postorder_for_each_entry_safe'

.mailmap

@@ -119,6 +119,13 @@ Mark Brown <[email protected]>
 Mark Yao <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
+Matthew Wilcox <[email protected]> <[email protected]>
 Matthieu CASTET <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
@@ -152,7 +159,13 @@ Peter Oruba <[email protected]>
 Peter Oruba <[email protected]>
 Pratyush Anand <[email protected]> <[email protected]>
 Praveen BP <[email protected]>
+Punit Agrawal <[email protected]> <[email protected]>
 Qais Yousef <[email protected]> <[email protected]>
+Oleksij Rempel <[email protected]> <[email protected]>
+Oleksij Rempel <[email protected]> <[email protected]>
+Oleksij Rempel <[email protected]> <[email protected]>
+Oleksij Rempel <[email protected]> <[email protected]>
+Oleksij Rempel <[email protected]> <[email protected]>
 Rajesh Shah <[email protected]>
 Ralf Baechle <[email protected]>
 Ralf Wildenhues <[email protected]>

CREDITS

@@ -2138,6 +2138,10 @@ E: [email protected]
 D: Soundblaster driver fixes, ISAPnP quirk
 S: California, USA
 
+N: Jarkko Lavinen
+E: [email protected]
+D: OMAP MMC support
+
 N: Jonathan Layes
 D: ARPD support
 
@@ -2200,6 +2204,10 @@ S: Post Office Box 371
 S: North Little Rock, Arkansas 72115
 S: USA
 
+N: Christopher Li
+E: [email protected]
+D: Sparse maintainer 2009 - 2018
+
 N: Stephan Linz
 E: [email protected]
 E: [email protected]
@@ -2533,6 +2541,10 @@ S: Ormond
 S: Victoria 3163
 S: Australia
 
+N: Eric Miao
+E: [email protected]
+D: MMP support
+
 N: Pauline Middelink
 E: [email protected]
 D: General low-level bug fixes, /proc fixes, identd support
@@ -4107,6 +4119,10 @@ S: 1507 145th Place SE #B5
 S: Bellevue, Washington 98007
 S: USA
 
+N: Haojian Zhuang
+E: [email protected]
+D: MMP support
+
 N: Richard Zidlicky
 E: [email protected], [email protected]
 W: http://www.geocities.com/rdzidlic