aboutsummaryrefslogtreecommitdiff
path: root/Next/merge.log
blob: fc8b03e360b22aa3719cfbaaa2889c5ac0c8a3db (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
$ date -R
Fri, 18 Jan 2019 08:06:46 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 47bfa6d9dc8c Merge tag 'selinux-pr-20190115' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Merging origin/master (a3a80255d58d Merge tag 'afs-fixes-20190117' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs)
$ git merge origin/master
Updating 47bfa6d9dc8c..a3a80255d58d
Fast-forward
 .../devicetree/bindings/arm/cpu-capacity.txt       |  2 +-
 .../devicetree/bindings/arm/idle-states.txt        |  2 +-
 Documentation/devicetree/bindings/arm/sp810.txt    |  2 +-
 Documentation/devicetree/bindings/arm/topology.txt |  2 +-
 .../devicetree/bindings/clock/marvell,mmp2.txt     |  2 +-
 .../devicetree/bindings/display/arm,pl11x.txt      |  2 +-
 .../devicetree/bindings/gpio/gpio-mvebu.txt        |  2 -
 .../bindings/interrupt-controller/arm,gic-v3.txt   |  2 +-
 .../devicetree/bindings/soc/qcom/qcom,glink.txt    |  2 +-
 .../devicetree/bindings/soc/qcom/qcom,smp2p.txt    |  4 +-
 Makefile                                           |  8 ++--
 arch/h8300/Makefile                                |  2 -
 arch/ia64/Makefile                                 |  2 -
 arch/nds32/Makefile                                |  8 ----
 arch/openrisc/Makefile                             |  3 --
 drivers/of/dynamic.c                               |  3 --
 drivers/of/fdt.c                                   |  4 --
 drivers/of/overlay.c                               |  3 --
 drivers/of/pdt.c                                   |  1 -
 drivers/of/property.c                              |  1 +
 fs/afs/flock.c                                     |  4 +-
 fs/afs/inode.c                                     |  3 +-
 fs/afs/protocol_yfs.h                              | 11 +++++
 fs/afs/rxrpc.c                                     | 53 +++++++++++++++++-----
 fs/afs/server_list.c                               |  4 +-
 fs/afs/yfsclient.c                                 |  2 +-
 .../dt-bindings/reset/amlogic,meson-axg-reset.h    |  3 +-
 include/linux/of.h                                 |  1 -
 include/trace/events/afs.h                         |  2 +
 init/Kconfig                                       |  1 +
 kernel/dma/swiotlb.c                               |  2 +
 kernel/seccomp.c                                   |  4 ++
 scripts/Kbuild.include                             |  4 --
 scripts/kconfig/Makefile                           |  2 +-
 security/security.c                                |  7 +++
 security/yama/yama_lsm.c                           |  4 +-
 36 files changed, 95 insertions(+), 69 deletions(-)
Merging fixes/master (0ce4e20ca4ea x86/syscalls: Mark expected switch fall-throughs)
$ git merge fixes/master
Auto-merging fs/afs/yfsclient.c
Auto-merging fs/afs/rxrpc.c
Auto-merging fs/afs/flock.c
Merge made by the 'recursive' strategy.
 arch/x86/include/asm/syscall.h                     | 28 ++++++++++++++++++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c    | 17 +++++++++++
 drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c |  1 +
 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c    |  2 ++
 drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c     |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c     |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c    |  1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c   |  2 ++
 drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c     |  1 +
 drivers/scsi/aic7xxx/aic79xx_core.c                | 14 +++++----
 drivers/scsi/aic7xxx/aic7xxx_core.c                | 12 ++++++--
 drivers/scsi/be2iscsi/be_iscsi.c                   |  1 +
 drivers/scsi/be2iscsi/be_main.c                    |  1 +
 drivers/scsi/bfa/bfa_fcpim.c                       |  6 ++--
 drivers/scsi/bfa/bfa_fcs_lport.c                   |  8 ++----
 drivers/scsi/bfa/bfa_fcs_rport.c                   | 19 +++++--------
 drivers/scsi/bfa/bfa_ioc.c                         |  9 ++----
 drivers/scsi/csiostor/csio_wr.c                    |  1 +
 drivers/scsi/esas2r/esas2r_init.c                  |  3 +-
 drivers/scsi/imm.c                                 | 33 +++++++++++-----------
 drivers/scsi/lpfc/lpfc_ct.c                        |  2 ++
 drivers/scsi/lpfc/lpfc_els.c                       |  1 +
 drivers/scsi/lpfc/lpfc_hbadisc.c                   |  4 ++-
 drivers/scsi/lpfc/lpfc_nportdisc.c                 |  1 +
 drivers/scsi/lpfc/lpfc_nvme.c                      |  1 +
 drivers/scsi/lpfc/lpfc_scsi.c                      |  8 +++---
 drivers/scsi/lpfc/lpfc_sli.c                       | 20 +++++++------
 drivers/scsi/osd/osd_initiator.c                   |  3 +-
 drivers/scsi/osst.c                                |  6 ++++
 drivers/scsi/ppa.c                                 |  1 +
 drivers/scsi/qla4xxx/ql4_os.c                      |  2 +-
 drivers/scsi/st.c                                  |  4 +++
 drivers/scsi/sym53c8xx_2/sym_hipd.c                |  2 ++
 drivers/scsi/sym53c8xx_2/sym_nvram.c               |  1 +
 fs/adfs/dir_f.c                                    |  6 ++++
 fs/afs/cmservice.c                                 |  8 ++++++
 fs/afs/file.c                                      |  2 ++
 fs/afs/flock.c                                     |  1 +
 fs/afs/fsclient.c                                  | 31 ++++++++++++--------
 fs/afs/misc.c                                      |  9 ++++++
 fs/afs/rxrpc.c                                     |  1 +
 fs/afs/vlclient.c                                  | 18 +++++++-----
 fs/afs/yfsclient.c                                 | 30 +++++++++++++-------
 45 files changed, 228 insertions(+), 97 deletions(-)
Merging kbuild-current/fixes (e00d88804814 kbuild: mark prepare0 as PHONY to fix external module build)
$ git merge kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (51769fabee34 ARCv2: lib: memeset: fix doing prefetchw outside of buffer)
$ git merge arc-current/for-curr
Auto-merging arch/arc/mm/init.c
Auto-merging arch/arc/mm/fault.c
CONFLICT (content): Merge conflict in arch/arc/mm/fault.c
Auto-merging arch/arc/kernel/setup.c
Auto-merging arch/arc/include/asm/bitops.h
Recorded preimage for 'arch/arc/mm/fault.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/arc/mm/fault.c'.
[master 927f2eb55320] Merge remote-tracking branch 'arc-current/for-curr'
$ git diff -M --stat --summary HEAD^..
 arch/arc/include/asm/Kbuild       |   4 -
 arch/arc/include/asm/arcregs.h    |  12 +-
 arch/arc/include/asm/bitops.h     |   6 +-
 arch/arc/include/asm/perf_event.h |   3 +-
 arch/arc/kernel/perf_event.c      | 241 ++++++++++++++++++++++++++++----------
 arch/arc/kernel/setup.c           |  27 +++--
 arch/arc/kernel/troubleshoot.c    |  30 +++--
 arch/arc/lib/memset-archs.S       |  40 +++++--
 arch/arc/mm/fault.c               |  13 +-
 arch/arc/mm/init.c                |   3 +-
 10 files changed, 276 insertions(+), 103 deletions(-)
Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return)
$ git merge arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (7fa1e2e6afa7 kasan, arm64: remove redundant ARCH_SLAB_MINALIGN define)
$ git merge arm64-fixes/for-next/fixes
Merge made by the 'recursive' strategy.
 arch/arm64/include/asm/cache.h | 2 --
 arch/arm64/include/asm/mmu.h   | 5 ++++-
 arch/arm64/kernel/kaslr.c      | 8 ++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)
Merging m68k-current/for-linus (bed1369f5190 m68k: Fix memblock-related crashes)
$ git merge m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (7bea7ac0ca01 powerpc/syscalls: Fix syscall tracing)
$ git merge powerpc-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/powerpc/include/uapi/asm/perf_regs.h       | 1 +
 arch/powerpc/kernel/head_8xx.S                  | 3 ++-
 arch/powerpc/kernel/signal_64.c                 | 7 ++++---
 arch/powerpc/kernel/trace/ftrace.c              | 7 -------
 arch/powerpc/perf/perf_regs.c                   | 6 ++++++
 arch/powerpc/platforms/4xx/ocm.c                | 6 +++---
 arch/powerpc/platforms/powernv/npu-dma.c        | 2 +-
 arch/powerpc/platforms/powernv/pci-ioda.c       | 3 ++-
 arch/powerpc/platforms/pseries/pci.c            | 2 ++
 tools/arch/powerpc/include/uapi/asm/perf_regs.h | 1 +
 tools/perf/arch/powerpc/include/perf_regs.h     | 3 ++-
 tools/perf/arch/powerpc/util/perf_regs.c        | 1 +
 12 files changed, 25 insertions(+), 17 deletions(-)
Merging sparc/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge sparc/master
Already up to date.
Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
$ git merge fscrypt-current/for-stable
Already up to date.
Merging net/master (cb12d72b27a6 atm: he: fix sign-extension overflow on large shift)
$ git merge net/master
Merge made by the 'recursive' strategy.
 Documentation/networking/rxrpc.txt                 |  45 -------
 Documentation/networking/snmp_counter.rst          | 130 ++++++++++++++++++++-
 drivers/atm/he.c                                   |   2 +-
 drivers/net/ethernet/intel/igb/igb.h               |   2 +-
 drivers/net/ethernet/intel/igb/igb_ethtool.c       |   4 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |  14 +--
 drivers/net/phy/bcm87xx.c                          |   2 +
 drivers/net/phy/marvell.c                          |  37 +++++-
 drivers/net/phy/meson-gxl.c                        |   1 +
 drivers/net/phy/micrel.c                           |   2 +
 drivers/net/phy/phy.c                              |  19 ++-
 drivers/net/phy/phy_device.c                       |  12 ++
 drivers/net/usb/aqc111.c                           |  15 +++
 drivers/net/usb/cdc_ether.c                        |   8 ++
 include/linux/phy.h                                |   2 +
 include/net/af_rxrpc.h                             |  16 ---
 include/net/ip_fib.h                               |   2 +-
 include/net/netfilter/nf_flow_table.h              |   1 -
 include/uapi/linux/in.h                            |   2 +-
 net/bpfilter/bpfilter_umh_blob.S                   |   2 +-
 net/bridge/netfilter/ebtables.c                    |   6 +-
 net/core/neighbour.c                               |   2 +-
 net/ipv4/fib_frontend.c                            |   4 +-
 net/ipv4/fib_trie.c                                |  15 ++-
 net/ipv4/fou.c                                     |   9 +-
 net/ipv4/ip_gre.c                                  |  23 ++--
 net/ipv4/tcp.c                                     |   2 +-
 net/ipv4/udp.c                                     |  16 ++-
 net/ipv6/fou6.c                                    |   9 +-
 net/ipv6/ip6_gre.c                                 |  14 ++-
 net/ipv6/route.c                                   |  14 +--
 net/ipv6/udp.c                                     |  16 ++-
 net/netfilter/nf_flow_table_core.c                 |   5 +-
 net/netfilter/nf_tables_api.c                      |  14 +--
 net/netfilter/nft_flow_offload.c                   |  13 ++-
 net/openvswitch/flow_netlink.c                     |   2 +-
 net/rxrpc/af_rxrpc.c                               |  70 -----------
 net/rxrpc/ar-internal.h                            |  19 +--
 net/rxrpc/call_object.c                            |  97 ---------------
 net/rxrpc/conn_client.c                            |   5 +-
 net/rxrpc/sendmsg.c                                |  24 ++--
 net/sched/act_tunnel_key.c                         |  19 +--
 net/sched/cls_api.c                                |   3 +-
 net/sched/sch_cake.c                               |   5 +-
 net/sched/sch_cbs.c                                |   3 +-
 net/sched/sch_drr.c                                |   7 +-
 net/sched/sch_dsmark.c                             |   3 +-
 net/sched/sch_hfsc.c                               |   9 +-
 net/sched/sch_htb.c                                |   3 +-
 net/sched/sch_prio.c                               |   3 +-
 net/sched/sch_qfq.c                                |  20 ++--
 net/sched/sch_tbf.c                                |   3 +-
 net/sctp/ipv6.c                                    |   5 +-
 net/sctp/protocol.c                                |   4 +-
 net/tipc/netlink_compat.c                          |  50 +++++++-
 net/tipc/topsrv.c                                  |   2 +-
 .../networking/timestamping/txtimestamp.c          |   2 +-
 .../selftests/tc-testing/tc-tests/actions/ife.json |  88 +++++++-------
 .../tc-testing/tc-tests/actions/tunnel_key.json    |  31 +----
 59 files changed, 495 insertions(+), 462 deletions(-)
Merging bpf/master (c61c27687a5a bpf: Correctly annotate implicit fall through in bpf_base_func_proto)
$ git merge bpf/master
Merge made by the 'recursive' strategy.
 kernel/bpf/btf.c                         |  2 +-
 kernel/bpf/cgroup.c                      |  1 +
 kernel/bpf/stackmap.c                    |  9 +++++++--
 net/core/filter.c                        |  2 +-
 net/xdp/xdp_umem.c                       | 16 +++++++++++++---
 samples/bpf/Makefile                     |  1 +
 samples/bpf/asm_goto_workaround.h        | 16 ++++++++++++++++
 tools/bpf/bpftool/Makefile               |  9 ++++++++-
 tools/lib/bpf/bpf.c                      | 19 +++++++++++++++----
 tools/testing/selftests/bpf/Makefile     |  1 +
 tools/testing/selftests/bpf/test_progs.c | 30 ++++++++++++++++++++++++++++++
 11 files changed, 94 insertions(+), 12 deletions(-)
 create mode 100644 samples/bpf/asm_goto_workaround.h
Merging ipsec/master (e2612cd496e7 xfrm: Make set-mark default behavior backward compatible)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
 net/ipv4/ip_vti.c                          |  50 ++++++++++
 net/xfrm/xfrm_policy.c                     |  63 ++++++------
 net/xfrm/xfrm_user.c                       |  13 ++-
 tools/testing/selftests/net/xfrm_policy.sh | 153 ++++++++++++++++++++++++-----
 4 files changed, 223 insertions(+), 56 deletions(-)
Merging netfilter/master (80b3671e9377 ip6_gre: update version related info when changing link)
$ git merge netfilter/master
Already up to date.
Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
$ git merge ipvs/master
Already up to date.
Merging wireless-drivers/master (ec5aecc0b227 iwlwifi: make IWLWIFI depend on CFG80211)
$ git merge wireless-drivers/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/intel/iwlwifi/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging mac80211/master (1d51b4b1d3f2 Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k)
$ git merge mac80211/master
Already up to date.
Merging rdma-fixes/for-rc (d6f4a21f309d RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT)
$ git merge rdma-fixes/for-rc
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/cma.c                |  5 ++-
 drivers/infiniband/core/nldev.c              |  4 --
 drivers/infiniband/core/rdma_core.h          |  2 +
 drivers/infiniband/core/uverbs_cmd.c         | 11 ++++-
 drivers/infiniband/core/uverbs_ioctl.c       | 62 ++++++++++++++++++++++------
 drivers/infiniband/core/uverbs_main.c        |  1 +
 drivers/infiniband/hw/mthca/mthca_provider.c |  4 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma.h    | 35 +++++++++++++++-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c |  6 +++
 include/uapi/rdma/vmw_pvrdma-abi.h           |  1 +
 10 files changed, 109 insertions(+), 22 deletions(-)
Merging sound-current/for-linus (687ae9e287b3 ASoC: intel: skl: Fix display power regression)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/patch_realtek.c |   2 +-
 sound/soc/codecs/hdac_hdmi.c  | 116 +++++-------------------------------------
 sound/soc/intel/skylake/skl.c |  13 ++---
 3 files changed, 18 insertions(+), 113 deletions(-)
Merging sound-asoc-fixes/for-linus (f06f20da6565 Merge branch 'asoc-5.0' into asoc-linus)
$ git merge sound-asoc-fixes/for-linus
Merge made by the 'recursive' strategy.
 include/sound/soc.h                           |   6 ++
 sound/core/compress_offload.c                 |   3 +-
 sound/soc/amd/raven/acp3x-pcm-dma.c           |   6 +-
 sound/soc/codecs/pcm512x.c                    |  11 +--
 sound/soc/codecs/rt274.c                      |   5 +-
 sound/soc/codecs/rt5514-spi.c                 |   2 +
 sound/soc/codecs/rt5682.c                     |   1 +
 sound/soc/codecs/rt5682.h                     |  24 ++---
 sound/soc/codecs/tlv320aic32x4.c              |   4 +
 sound/soc/fsl/imx-audmux.c                    |  24 ++---
 sound/soc/intel/Kconfig                       |   2 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c  |   8 +-
 sound/soc/intel/boards/broadwell.c            |   2 +-
 sound/soc/intel/boards/glk_rt5682_max98357a.c |  45 ++-------
 sound/soc/intel/boards/haswell.c              |   2 +-
 sound/soc/qcom/qdsp6/q6asm-dai.c              |  17 +++-
 sound/soc/qcom/sdm845.c                       |  31 ++++--
 sound/soc/sh/dma-sh7760.c                     |   2 +-
 sound/soc/soc-core.c                          |  34 +++++--
 sound/soc/soc-dapm.c                          |  10 +-
 sound/soc/ti/davinci-mcasp.c                  | 136 ++++++++++++--------------
 sound/soc/xilinx/Kconfig                      |   2 +-
 sound/soc/xilinx/xlnx_i2s.c                   |  15 ++-
 23 files changed, 208 insertions(+), 184 deletions(-)
Merging regmap-fixes/for-linus (b3ffce399349 Merge branch 'regmap-5.0' into regmap-linus)
$ git merge regmap-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regmap-irq.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Merging regulator-fixes/for-linus (b4c4aa249eff Merge branch 'regulator-5.0' into regulator-linus)
$ git merge regulator-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/regulator/bcm590xx-regulator.c  |  4 ++++
 drivers/regulator/lochnagar-regulator.c |  2 +-
 drivers/regulator/max77620-regulator.c  | 10 +++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)
Merging spi-fixes/for-linus (601ea15da77b Merge branch 'spi-5.0' into spi-linus)
$ git merge spi-fixes/for-linus
Merge made by the 'recursive' strategy.
 drivers/spi/spi-dw.c          | 36 ++++++++---------
 drivers/spi/spi-fsl-dspi.c    |  2 +-
 drivers/spi/spi-fsl-lpspi.c   | 92 ++++++++++++++++++++++---------------------
 drivers/spi/spi-npcm-pspi.c   |  3 +-
 drivers/spi/spi-omap2-mcspi.c |  4 +-
 drivers/spi/spi-sprd.c        | 10 +++--
 6 files changed, 77 insertions(+), 70 deletions(-)
Merging pci-current/for-linus (d2fd6e81912a PCI: Fix __initdata issue with "pci=disable_acs_redir" parameter)
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/pci/Kconfig | 22 ++++++++--------------
 drivers/pci/msi.c   | 22 +++++++++++++---------
 drivers/pci/pci.c   |  3 ++-
 3 files changed, 23 insertions(+), 24 deletions(-)
Merging driver-core.current/driver-core-linus (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge driver-core.current/driver-core-linus
Already up to date.
Merging tty.current/tty-linus (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge usb.current/usb-linus
Already up to date.
Merging usb-gadget-fixes/fixes (87b6d2c56825 usb: dwc2: gadget: Fix Remote Wakeup interrupt bit clearing)
$ git merge usb-gadget-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/usb/dwc2/gadget.c                  | 2 +-
 drivers/usb/dwc3/gadget.c                  | 4 ++++
 drivers/usb/gadget/function/f_sourcesink.c | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
Merging usb-serial-fixes/usb-linus (4dcf9ddc9ad5 USB: serial: pl2303: add new PID to support PL2303TB)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
 drivers/usb/serial/ftdi_sio.c          | 15 ++++++++++++++-
 drivers/usb/serial/pl2303.c            |  1 +
 drivers/usb/serial/pl2303.h            |  2 ++
 drivers/usb/serial/usb-serial-simple.c |  3 ++-
 4 files changed, 19 insertions(+), 2 deletions(-)
Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/ci_hdrc_imx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Merging phy/fixes (827cb0323928 phy: ath79-usb: Fix the main reset name to match the DT binding)
$ git merge phy/fixes
Merge made by the 'recursive' strategy.
 drivers/phy/qualcomm/phy-ath79-usb.c | 4 ++--
 drivers/phy/ti/phy-gmii-sel.c        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Merging staging.current/staging-linus (5f74a8cbb38d staging: rtl8188eu: Add device code for D-Link DWA-121 rev B1)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
 drivers/staging/rtl8188eu/os_dep/usb_intf.c                    | 1 +
 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 1 +
 drivers/staging/wilc1000/host_interface.c                      | 5 ++---
 drivers/staging/wilc1000/wilc_wlan.c                           | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)
Merging char-misc.current/char-misc-linus (f7ee8ead151f mei: me: add denverton innovation engine device IDs)
$ git merge char-misc.current/char-misc-linus
Merge made by the 'recursive' strategy.
 drivers/android/binderfs.c                         | 166 ++++++++++++++-------
 drivers/hv/channel.c                               |   9 +-
 drivers/hv/hv_balloon.c                            |  10 +-
 drivers/hv/ring_buffer.c                           |  31 ++--
 drivers/hv/vmbus_drv.c                             |  91 +++++++----
 drivers/misc/mei/hbm.c                             |  12 +-
 drivers/misc/mei/hw-me-regs.h                      |   2 +
 drivers/misc/mei/pci-me.c                          |   4 +-
 include/linux/hyperv.h                             |   5 +-
 .../linux/android/{binder_ctl.h => binderfs.h}     |   0
 10 files changed, 210 insertions(+), 120 deletions(-)
 rename include/uapi/linux/android/{binder_ctl.h => binderfs.h} (100%)
Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (d77651a227f8 Input: uinput - fix undefined behavior in uinput_validate_absinfo())
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
 drivers/input/joystick/xpad.c     | 3 +++
 drivers/input/misc/uinput.c       | 5 +++--
 drivers/input/touchscreen/Kconfig | 2 +-
 include/uapi/linux/input.h        | 6 +++++-
 4 files changed, 12 insertions(+), 4 deletions(-)
Merging crypto-current/master (d45a90cb5d06 crypto: sm3 - fix undefined shift by >= width of value)
$ git merge crypto-current/master
Merge made by the 'recursive' strategy.
 crypto/adiantum.c                            |  4 +++
 crypto/authenc.c                             | 14 +++++++--
 crypto/authencesn.c                          |  2 +-
 crypto/sm3_generic.c                         |  2 +-
 drivers/crypto/Kconfig                       |  1 +
 drivers/crypto/bcm/cipher.c                  | 44 ++++++++--------------------
 drivers/crypto/caam/caamalg.c                |  2 +-
 drivers/crypto/caam/caamhash.c               | 15 ++++++----
 drivers/crypto/caam/desc.h                   |  1 +
 drivers/crypto/caam/error.h                  |  9 ++++++
 drivers/crypto/cavium/nitrox/nitrox_reqmgr.c |  2 +-
 drivers/crypto/ccree/cc_aead.c               | 40 ++++++++++++-------------
 drivers/crypto/talitos.c                     | 26 ++++++----------
 13 files changed, 80 insertions(+), 82 deletions(-)
Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons)
$ git merge ide/master
Merge made by the 'recursive' strategy.
Merging vfio-fixes/for-linus (58fec830fc19 vfio/type1: Fix unmap overflow off-by-one)
$ git merge vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (3d244c192afe selftests/seccomp: Abort without user notification support)
$ git merge kselftest-fixes/fixes
Merge made by the 'recursive' strategy.
 tools/testing/selftests/gpio/gpio-mockup-chardev.c |   9 +-
 tools/testing/selftests/rtc/rtctest.c              | 109 ++++++++++++++++++++-
 tools/testing/selftests/seccomp/Makefile           |   2 +-
 tools/testing/selftests/seccomp/seccomp_bpf.c      |  10 +-
 tools/testing/selftests/vm/gup_benchmark.c         |   1 +
 tools/testing/selftests/x86/mpx-mini-test.c        |   2 +-
 tools/testing/selftests/x86/unwind_vdso.c          |   1 -
 7 files changed, 118 insertions(+), 16 deletions(-)
Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
$ git merge modules-fixes/modules-linus
Already up to date.
Merging slave-dma-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge slave-dma-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
$ git merge backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/master (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge mtd-fixes/master
Already up to date.
Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
$ git merge spi-nor-fixes/spi-nor/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data")
$ git merge mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (240809ef6630 media: vim2m: only cancel work if it is for right context)
$ git merge v4l-dvb-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/media/platform/vim2m.c       |  4 +++-
 drivers/media/v4l2-core/v4l2-ioctl.c | 24 +++++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)
Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
$ git merge reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (8a644c64a9f1 MIPS: OCTEON: fix kexec support)
$ git merge mips-fixes/mips-fixes
Merge made by the 'recursive' strategy.
 arch/mips/Kconfig                                  |  1 +
 arch/mips/bcm47xx/setup.c                          | 31 +++++++++
 arch/mips/cavium-octeon/setup.c                    |  2 +-
 arch/mips/configs/ath79_defconfig                  |  1 +
 .../include/asm/mach-lantiq/falcon/falcon_irq.h    |  2 -
 .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h |  2 -
 arch/mips/jazz/jazzdma.c                           |  5 +-
 arch/mips/lantiq/irq.c                             | 77 ++--------------------
 arch/mips/pci/msi-octeon.c                         |  4 +-
 include/linux/bcma/bcma_soc.h                      |  1 +
 10 files changed, 47 insertions(+), 79 deletions(-)
Merging at91-fixes/at91-fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (935853fa3e1b ARM: dts: omap3-gta04: Fix graph_port warning)
$ git merge omap-fixes/fixes
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi |  2 +-
 arch/arm/boot/dts/omap3-gta04.dtsi             |  4 ---
 arch/arm/boot/dts/omap3-n950-n9.dtsi           | 42 +++++++++++++++++---------
 arch/arm/boot/dts/omap5-l4.dtsi                |  2 --
 4 files changed, 29 insertions(+), 21 deletions(-)
Merging kvm-fixes/master (826c1362e79a x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed)
$ git merge kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
$ git merge kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (f422449b5854 hwmon: (tmp421) Correct the misspelling of the tmp442 compatible attribute in OF device ID table)
$ git merge hwmon-fixes/hwmon
Merge made by the 'recursive' strategy.
 drivers/hwmon/lm80.c       |  4 +++-
 drivers/hwmon/nct6775.c    | 12 +++++++-----
 drivers/hwmon/occ/common.c | 24 ++++++++++++------------
 drivers/hwmon/tmp421.c     |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (e2ad175844cc acpi/nfit: Fix command-supported detection)
$ git merge nvdimm-fixes/libnvdimm-fixes
Merge made by the 'recursive' strategy.
 drivers/acpi/nfit/core.c  | 79 +++++++++++++++++++++++++++++++----------------
 drivers/acpi/nfit/intel.c |  8 ++---
 drivers/nvdimm/nd-core.h  |  4 +--
 include/linux/libnvdimm.h |  1 +
 4 files changed, 59 insertions(+), 33 deletions(-)
Merging btrfs-fixes/next-fixes (65b4e1469131 Merge branch 'ext/josef/iput-fixes-for-5.0' into next-fixes)
$ git merge btrfs-fixes/next-fixes
Merge made by the 'recursive' strategy.
 fs/btrfs/ctree.h       | 11 ++++++++++-
 fs/btrfs/disk-io.c     | 17 ++++++++++++++---
 fs/btrfs/extent-tree.c | 38 +++++++++++++++++++++++++++-----------
 fs/btrfs/inode.c       | 26 +++++++++++++++++++++++---
 fs/btrfs/transaction.c |  4 ++++
 5 files changed, 78 insertions(+), 18 deletions(-)
Merging vfs-fixes/fixes (61aa329d0762 cgroup: saner refcounting for cgroup_root)
$ git merge vfs-fixes/fixes
Auto-merging kernel/cgroup/cgroup.c
Auto-merging kernel/cgroup/cgroup-v1.c
Auto-merging kernel/cgroup/cgroup-internal.h
Merge made by the 'recursive' strategy.
 fs/kernfs/mount.c               |  8 ++++--
 kernel/cgroup/cgroup-internal.h |  2 +-
 kernel/cgroup/cgroup-v1.c       | 58 +++++++++--------------------------------
 kernel/cgroup/cgroup.c          | 25 +++++++++---------
 4 files changed, 33 insertions(+), 60 deletions(-)
Merging dma-mapping-fixes/for-linus (222e3872c2de swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit)
$ git merge dma-mapping-fixes/for-linus
Merge made by the 'recursive' strategy.
Merging i3c-fixes/master (f29fd331aa05 i3c: master: dw-i3c-master: fix i3c_attach/reattach)
$ git merge i3c-fixes/master
Merge made by the 'recursive' strategy.
 drivers/i3c/master/dw-i3c-master.c   | 7 ++-----
 drivers/i3c/master/i3c-master-cdns.c | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)
Merging drivers-x86-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
$ git merge pinctrl-samsung-fixes/pinctrl-fixes
Already up to date.
Merging devicetree-fixes/dt/linus (3705add0b783 dt-bindings: reset: meson-axg: fix SPDX license id)
$ git merge devicetree-fixes/dt/linus
Already up to date.
Merging scsi-fixes/fixes (9e8f1c798314 scsi: cxgb4i: add wait_for_completion())
$ git merge scsi-fixes/fixes
Auto-merging drivers/scsi/smartpqi/smartpqi_init.c
Auto-merging drivers/scsi/qla4xxx/ql4_os.c
Auto-merging drivers/scsi/pm8001/pm8001_sas.c
Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c
Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
Auto-merging drivers/scsi/lpfc/lpfc_sli.c
Merge made by the 'recursive' strategy.
 drivers/scsi/cxgbi/cxgb3i/cxgb3i.c          |  9 ++-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c          | 28 ++++++---
 drivers/scsi/cxgbi/libcxgbi.c               |  7 ++-
 drivers/scsi/cxgbi/libcxgbi.h               |  5 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c      | 12 ++--
 drivers/scsi/isci/init.c                    | 14 ++---
 drivers/scsi/megaraid/megaraid_sas_base.c   |  2 +-
 drivers/scsi/megaraid/megaraid_sas_fusion.c |  3 +-
 drivers/scsi/pm8001/pm8001_sas.c            |  2 +-
 drivers/scsi/qedi/qedi_iscsi.c              |  3 +
 drivers/scsi/qedi/qedi_iscsi.h              |  1 +
 drivers/scsi/qla1280.c                      |  2 +-
 drivers/scsi/qla2xxx/qla_def.h              |  2 +
 drivers/scsi/qla2xxx/qla_isr.c              |  1 +
 drivers/scsi/qla2xxx/qla_os.c               |  2 +-
 drivers/scsi/qla4xxx/ql4_os.c               |  2 +
 drivers/scsi/scsi_pm.c                      | 26 +++++----
 drivers/scsi/sd.c                           |  6 ++
 drivers/scsi/smartpqi/smartpqi_init.c       |  2 +-
 drivers/scsi/ufs/ufs.h                      |  2 +-
 drivers/scsi/ufs/ufshcd.c                   |  2 +
 drivers/target/iscsi/iscsi_target.c         |  2 +-
 drivers/target/target_core_user.c           | 88 ++++++++++++++++++++---------
 23 files changed, 146 insertions(+), 77 deletions(-)
Merging drm-fixes/drm-fixes (e2d3c414ec0f Merge tag 'drm-intel-fixes-2019-01-11' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes)
$ git merge drm-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (15c05196ff84 Merge tag 'gvt-fixes-2018-01-17' of https://github.com/intel/gvt-linux into drm-intel-fixes)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/gvt/handlers.c  |  1 +
 drivers/gpu/drm/i915/gvt/hypercall.h |  2 +-
 drivers/gpu/drm/i915/gvt/kvmgt.c     | 30 ++++++++++++++++++++++++++----
 drivers/gpu/drm/i915/gvt/mpt.h       |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
Merging mmc-fixes/fixes (2bd44dadd5bf mmc: sdhci-iproc: handle mmc_of_parse() errors during probe)
$ git merge mmc-fixes/fixes
Merge made by the 'recursive' strategy.
 drivers/mmc/host/Kconfig        |  4 ++--
 drivers/mmc/host/meson-gx-mmc.c | 18 +++++++++++-------
 drivers/mmc/host/sdhci-iproc.c  |  5 ++++-
 3 files changed, 17 insertions(+), 10 deletions(-)
Merging rtc-fixes/rtc-fixes (bfeffd155283 Linux 5.0-rc1)
$ git merge rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (bfeffd155283 Linux 5.0-rc1)
$ git merge gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (a986435b3297 hv_netvsc: fix typos in code comments)
$ git merge hyperv-fixes/hyperv-fixes
Merge made by the 'recursive' strategy.
 drivers/net/hyperv/hyperv_net.h   |  12 ++--
 drivers/net/hyperv/netvsc.c       |   4 +-
 drivers/net/hyperv/netvsc_drv.c   | 145 ++++++++++++++++++++++++--------------
 drivers/net/hyperv/rndis_filter.c |  36 +++++++---
 4 files changed, 129 insertions(+), 68 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (4bb0e6d72582 drm/sun4i: backend: add missing of_node_puts)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/meson/meson_crtc.c      | 23 ++---------------------
 drivers/gpu/drm/meson/meson_drv.c       | 14 ++++++++++++--
 drivers/gpu/drm/qxl/qxl_drv.c           |  4 ----
 drivers/gpu/drm/qxl/qxl_prime.c         | 14 --------------
 drivers/gpu/drm/rockchip/rockchip_rgb.c |  4 +++-
 drivers/gpu/drm/sun4i/sun4i_backend.c   |  5 +++--
 drivers/gpu/drm/virtio/virtgpu_drv.c    |  4 ----
 drivers/gpu/drm/virtio/virtgpu_drv.h    |  4 ----
 drivers/gpu/drm/virtio/virtgpu_prime.c  | 14 --------------
 9 files changed, 20 insertions(+), 66 deletions(-)
Merging kbuild/for-next (e00d88804814 kbuild: mark prepare0 as PHONY to fix external module build)
$ git merge kbuild/for-next
Already up to date.
Merging compiler-attributes/compiler-attributes (3e2ffd655cc6 include/linux/compiler*.h: fix OPTIMIZER_HIDE_VAR)
$ git merge compiler-attributes/compiler-attributes
Auto-merging include/linux/compiler-gcc.h
Merge made by the 'recursive' strategy.
 include/linux/compiler-clang.h | 5 ++---
 include/linux/compiler-gcc.h   | 4 ----
 include/linux/compiler-intel.h | 4 +---
 include/linux/compiler.h       | 4 +++-
 4 files changed, 6 insertions(+), 11 deletions(-)
Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
$ git merge leaks/leaks-next
Merge made by the 'recursive' strategy.
Merging dma-mapping/for-next (8b1cce9f5832 dma-mapping: fix inverted logic in dma_supported)
$ git merge dma-mapping/for-next
Already up to date.
Merging asm-generic/master (2b3c5a99d5f3 sh: generate uapi header and syscall table header files)
$ git merge asm-generic/master
Already up to date.
Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
$ git merge arc/for-next
Already up to date.
Merging arm/for-next (8f839a25b9cc Merge branches 'fixes', 'misc', 'sa1100-for-next', 'smp-hotplug' (early part) and 'spectre' into for-next)
$ git merge arm/for-next
Removing arch/arm/mach-oxnas/hotplug.c
Merge made by the 'recursive' strategy.
 arch/arm/mach-actions/platsmp.c |  15 ------
 arch/arm/mach-oxnas/Makefile    |   1 -
 arch/arm/mach-oxnas/hotplug.c   | 109 ----------------------------------------
 arch/arm/mach-oxnas/platsmp.c   |   4 --
 arch/arm/mach-qcom/platsmp.c    |  26 ----------
 5 files changed, 155 deletions(-)
 delete mode 100644 arch/arm/mach-oxnas/hotplug.c
Merging arm64/for-next/core (7e0b44e870cf arm64: compat: Hook up io_pgetevents() for 32-bit tasks)
$ git merge arm64/for-next/core
Already up to date.
Merging arm-perf/for-next/perf (c061ce249f9b dt-bindings: arm: Convert PMU binding to json-schema)
$ git merge arm-perf/for-next/perf
Removing Documentation/devicetree/bindings/arm/pmu.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/pmu.txt  | 70 ---------------------
 Documentation/devicetree/bindings/arm/pmu.yaml | 87 ++++++++++++++++++++++++++
 MAINTAINERS                                    |  2 +-
 3 files changed, 88 insertions(+), 71 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/pmu.txt
 create mode 100644 Documentation/devicetree/bindings/arm/pmu.yaml
Merging arm-soc/for-next (f217b8e70c76 ARM: Document merges)
$ git merge arm-soc/for-next
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Resolved 'MAINTAINERS' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9ed4e29f0b6c] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                            |  1 -
 arch/arm/arm-soc-for-next-contents.txt | 66 ++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
$ git merge actions/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
$ git merge alpine/alpine/for-next
Already up to date.
Merging amlogic/for-next (2710bac89836 Merge branch 'v5.1/dt64' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 .../display/amlogic,simple-framebuffer.txt         | 33 ++++++++++
 .../devicetree/bindings/gpu/arm,mali-utgard.txt    |  6 ++
 arch/arm/boot/dts/meson.dtsi                       |  2 +-
 arch/arm/boot/dts/meson6.dtsi                      |  8 +++
 arch/arm/boot/dts/meson8.dtsi                      | 66 ++++++++++++++++++++
 arch/arm/boot/dts/meson8b-ec100.dts                |  3 +-
 arch/arm/boot/dts/meson8b-odroidc1.dts             | 28 ++++++++-
 arch/arm/boot/dts/meson8b.dtsi                     | 54 +++++++++++++++++
 arch/arm/boot/dts/meson8m2-mxiii-plus.dts          |  3 +-
 arch/arm64/boot/dts/amlogic/meson-axg-s400.dts     | 30 +++++++++-
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi         | 20 +++++++
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi        | 70 ++++++++--------------
 .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi |  3 +-
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi          | 23 +++++++
 .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts      |  3 +-
 .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts    |  3 +-
 .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 13 +++-
 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi   |  3 +-
 .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi      |  3 +-
 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi  |  3 +-
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        |  6 ++
 .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts |  3 +-
 .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts   |  3 +-
 .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts    |  3 +-
 .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi     |  3 +-
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi         |  6 ++
 .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts     |  3 +-
 .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |  3 +-
 arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts |  3 +-
 29 files changed, 325 insertions(+), 85 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt
Merging aspeed/for-next (d5e12a2c968d Merge branch 'aspeed-5.1-devicetree' into for-next)
$ git merge aspeed/for-next
Merge made by the 'recursive' strategy.
 .../dts/aspeed-bmc-arm-stardragon4800-rep2.dts     | 10 +++++++
 .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 35 ++++++++++++++++++++--
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts      |  5 ++++
 arch/arm/boot/dts/aspeed-g4.dtsi                   |  1 +
 arch/arm/boot/dts/aspeed-g5.dtsi                   | 34 ++++++++++++++++++++-
 5 files changed, 82 insertions(+), 3 deletions(-)
Merging at91/at91-next (3850dd7a32a0 Merge branch 'at91-dt' into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/at91-nattis-2-natte-2.dts |  2 +-
 arch/arm/boot/dts/at91-sama5d27_som1.dtsi   | 30 +++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts |  4 ++++
 arch/arm/boot/dts/at91-wb45n.dts            |  2 +-
 arch/arm/boot/dts/at91-wb50n.dts            |  4 ++--
 5 files changed, 38 insertions(+), 4 deletions(-)
Merging bcm2835/for-next (9ef81d65b288 Merge branch 'bcm2835-dt-64-next' into for-next)
$ git merge bcm2835/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt   |   4 +
 .../bindings/soc/bcm/brcm,bcm2835-pm.txt           |  46 ++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/bcm2835-rpi.dtsi                 |   4 -
 arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts         | 175 ++++++
 arch/arm/boot/dts/bcm283x.dtsi                     |  17 +-
 arch/arm/mach-bcm/Kconfig                          |   1 +
 arch/arm64/boot/dts/broadcom/Makefile              |   3 +-
 .../boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts     |   2 +
 drivers/firmware/raspberrypi.c                     |  11 +
 drivers/mfd/Makefile                               |   1 +
 drivers/mfd/bcm2835-pm.c                           |  92 +++
 drivers/soc/bcm/Kconfig                            |  11 +
 drivers/soc/bcm/Makefile                           |   1 +
 drivers/soc/bcm/bcm2835-power.c                    | 661 +++++++++++++++++++++
 drivers/watchdog/bcm2835_wdt.c                     |  26 +-
 include/dt-bindings/soc/bcm2835-pm.h               |  28 +
 include/linux/mfd/bcm2835-pm.h                     |  14 +
 include/soc/bcm2835/raspberrypi-firmware.h         |   4 +
 19 files changed, 1077 insertions(+), 25 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-pm.txt
 create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-a-plus.dts
 create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-a-plus.dts
 create mode 100644 drivers/mfd/bcm2835-pm.c
 create mode 100644 drivers/soc/bcm/bcm2835-power.c
 create mode 100644 include/dt-bindings/soc/bcm2835-pm.h
 create mode 100644 include/linux/mfd/bcm2835-pm.h
Merging imx-mxs/for-next (32cb82a0e36b Merge branch 'imx/maintainers' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/arm/technologic.txt
Removing Documentation/devicetree/bindings/arm/olimex.txt
Removing Documentation/devicetree/bindings/arm/i2se.txt
Removing Documentation/devicetree/bindings/arm/fsl.txt
Removing Documentation/devicetree/bindings/arm/compulab-boards.txt
Removing Documentation/devicetree/bindings/arm/bhf.txt
Removing Documentation/devicetree/bindings/arm/armadeus.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/armadeus.txt |   6 -
 Documentation/devicetree/bindings/arm/bhf.txt      |   6 -
 .../devicetree/bindings/arm/compulab-boards.txt    |  25 -
 .../bindings/arm/freescale/fsl,imx7ulp-sim.txt     |  16 +
 .../devicetree/bindings/arm/freescale/fsl,scu.txt  |   8 +-
 Documentation/devicetree/bindings/arm/fsl.txt      | 237 --------
 Documentation/devicetree/bindings/arm/fsl.yaml     | 223 ++++++++
 Documentation/devicetree/bindings/arm/i2se.txt     |  22 -
 Documentation/devicetree/bindings/arm/olimex.txt   |  10 -
 .../devicetree/bindings/arm/technologic.txt        |  23 -
 Documentation/devicetree/bindings/bus/imx-weim.txt |  32 +-
 .../devicetree/bindings/power/fsl,imx-gpcv2.txt    |   3 +
 MAINTAINERS                                        |  13 +-
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm/boot/dts/imx27.dtsi                       |   2 +-
 arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts   |  16 +
 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi  |  34 +-
 arch/arm/boot/dts/imx6dl-yapp4-common.dtsi         | 595 +++++++++++++++++++++
 arch/arm/boot/dts/imx6dl-yapp4-draco.dts           |  58 ++
 arch/arm/boot/dts/imx6dl-yapp4-hydra.dts           |  50 ++
 arch/arm/boot/dts/imx6dl-yapp4-ursa.dts            |  54 ++
 arch/arm/boot/dts/imx6q-pistachio.dts              |   2 +-
 arch/arm/boot/dts/imx6q-tbs2910.dts                |  49 +-
 arch/arm/boot/dts/imx6sl.dtsi                      |   8 +-
 arch/arm/boot/dts/imx6sll-evk.dts                  |   2 +-
 arch/arm/boot/dts/imx6sx.dtsi                      |  21 +-
 arch/arm/boot/dts/imx6ul.dtsi                      |   8 +
 arch/arm/boot/dts/imx6ull.dtsi                     |  12 +
 arch/arm/boot/dts/imx7s.dtsi                       |   8 +
 arch/arm/boot/dts/imx7ulp.dtsi                     |  19 +-
 arch/arm/boot/dts/ls1021a.dtsi                     |  10 +
 arch/arm/boot/dts/vf610-bk4.dts                    |  35 +-
 arch/arm/boot/dts/vf610-zii-cfu1.dts               |   2 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   3 +
 arch/arm/mach-imx/Makefile                         |   3 +-
 arch/arm/mach-imx/common.h                         |  10 +
 arch/arm/mach-imx/cpuidle-imx7ulp.c                |  60 +++
 arch/arm/mach-imx/cpuidle.h                        |   5 +
 arch/arm/mach-imx/mach-imx7ulp.c                   |  46 ++
 arch/arm/mach-imx/pm-imx7ulp.c                     |  49 +-
 arch/arm64/boot/dts/freescale/Makefile             |   1 +
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     |   2 +
 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts  |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi     |   6 +
 arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts  |   2 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts  |   4 +-
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  11 +
 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi     |  97 +++-
 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi     |   6 +
 arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi     | 120 +++++
 arch/arm64/boot/dts/freescale/imx8mq.dtsi          | 162 +++++-
 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts      | 137 +++++
 arch/arm64/boot/dts/freescale/imx8qxp.dtsi         | 446 +++++++++++++++
 arch/arm64/configs/defconfig                       |  16 +
 drivers/bus/imx-weim.c                             |  70 ++-
 drivers/firmware/imx/scu-pd.c                      |   1 +
 drivers/soc/imx/Kconfig                            |   2 +-
 drivers/soc/imx/gpcv2.c                            |  76 ++-
 include/dt-bindings/clock/imx8mq-clock.h           |  26 +-
 59 files changed, 2501 insertions(+), 474 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/bhf.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/compulab-boards.txt
 create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-sim.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/fsl.txt
 create mode 100644 Documentation/devicetree/bindings/arm/fsl.yaml
 delete mode 100644 Documentation/devicetree/bindings/arm/i2se.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/olimex.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/technologic.txt
 create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-common.dtsi
 create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-draco.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-hydra.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-ursa.dts
 create mode 100644 arch/arm/mach-imx/cpuidle-imx7ulp.c
 create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp-mek.dts
 create mode 100644 arch/arm64/boot/dts/freescale/imx8qxp.dtsi
Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next)
$ git merge keystone/next
Already up to date!
Merge made by the 'recursive' strategy.
Merging mediatek/for-next (ecee13a082e0 Merge branch 'v5.0-next/dts64' into for-next)
$ git merge mediatek/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/mt7623.dtsi                   |  15 +-
 arch/arm64/boot/dts/mediatek/mt2712-evb.dts     |  98 +++++
 arch/arm64/boot/dts/mediatek/mt2712e.dtsi       | 555 ++++++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt6797-evb.dts     |   2 +
 arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts |   2 +
 arch/arm64/boot/dts/mediatek/mt6797.dtsi        |  28 ++
 arch/arm64/boot/dts/mediatek/mt7622.dtsi        |   9 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi        |   6 +-
 8 files changed, 707 insertions(+), 8 deletions(-)
Merging mvebu/for-next (b5f034845e70 ARM: dts: kirkwood: Fix polarity of GPIO fan lines)
$ git merge mvebu/for-next
Already up to date.
Merging omap/for-next (ace233293086 Merge branch 'omap-for-v4.21/dt' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/am335x-chiliboard.dts           |  4 ++++
 arch/arm/boot/dts/omap3-evm-common.dtsi           |  7 +++++--
 arch/arm/boot/dts/omap3-evm-processor-common.dtsi | 10 +++++++++-
 arch/arm/boot/dts/omap4-droid4-xt894.dts          | 10 +++++++---
 arch/arm/boot/dts/omap4-panda-common.dtsi         |  6 ++++--
 5 files changed, 29 insertions(+), 8 deletions(-)
Merging reset/reset/next (d3490aa43e56 reset: socfpga: declare socfpga_reset_init in a header file)
$ git merge reset/reset/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                     | 1 +
 arch/arm/mach-socfpga/socfpga.c | 3 +--
 arch/arm/mach-sunxi/sunxi.c     | 2 +-
 drivers/reset/reset-socfpga.c   | 2 +-
 drivers/reset/reset-sunxi.c     | 1 +
 include/linux/reset/socfpga.h   | 7 +++++++
 include/linux/reset/sunxi.h     | 7 +++++++
 7 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 include/linux/reset/socfpga.h
 create mode 100644 include/linux/reset/sunxi.h
Merging qcom/for-next (a3ece12f1917 Merge branch 'arm64-for-5.1' into all-for-5.1)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi  |   2 +
 arch/arm64/boot/dts/qcom/msm8996-pins.dtsi |   2 +-
 arch/arm64/boot/dts/qcom/pm8916.dtsi       |   6 +
 arch/arm64/boot/dts/qcom/pms405.dtsi       |  79 +++++++++++++
 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi   |   5 +
 arch/arm64/boot/dts/qcom/qcs404.dtsi       |  20 ++++
 arch/arm64/boot/dts/qcom/sdm845-mtp.dts    |  72 +++++++++++-
 arch/arm64/boot/dts/qcom/sdm845.dtsi       | 176 ++++++++++++++++++++++++++++-
 8 files changed, 358 insertions(+), 4 deletions(-)
Merging renesas/next (903b2bb37299 Merge branches 'fixes-for-v5.0', 'arm-dt-for-v5.1' and 'arm64-dt-for-v5.1' into next)
$ git merge renesas/next
Auto-merging arch/arm64/configs/defconfig
Auto-merging MAINTAINERS
Removing Documentation/devicetree/bindings/arm/shmobile.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/renesas.yaml |  228 +++
 Documentation/devicetree/bindings/arm/shmobile.txt |  155 --
 MAINTAINERS                                        |    6 +-
 arch/arm/boot/dts/r8a7743.dtsi                     |   43 +-
 arch/arm/boot/dts/r8a7744.dtsi                     |  150 +-
 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts          |   18 +
 arch/arm/boot/dts/r8a7778.dtsi                     |   28 +
 arch/arm/boot/dts/r8a7790-stout.dts                |   15 +-
 arch/arm/configs/multi_v7_defconfig                |    1 +
 arch/arm/configs/shmobile_defconfig                |    1 +
 arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c |    5 +
 arch/arm64/boot/dts/renesas/r8a774a1.dtsi          |    5 +-
 arch/arm64/boot/dts/renesas/r8a774c0.dtsi          | 1751 ++++++++++++++++++++
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           |   40 +-
 .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts |    3 +-
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           |   43 +-
 arch/arm64/boot/dts/renesas/r8a77965.dtsi          |    3 +
 arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts     |    2 +
 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts     |   25 +-
 arch/arm64/boot/dts/renesas/r8a77990.dtsi          |  194 +--
 arch/arm64/boot/dts/renesas/r8a77995-draak.dts     |    4 +-
 arch/arm64/boot/dts/renesas/ulcb-kf.dtsi           |  138 ++
 arch/arm64/boot/dts/renesas/ulcb.dtsi              |   70 +-
 arch/arm64/configs/defconfig                       |    3 +
 include/dt-bindings/clock/r8a7778-clock.h          |    2 +
 25 files changed, 2503 insertions(+), 430 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/renesas.yaml
 delete mode 100644 Documentation/devicetree/bindings/arm/shmobile.txt
 create mode 100644 arch/arm64/boot/dts/renesas/r8a774c0.dtsi
Merging rockchip/for-next (0355b8299d0a Merge branch 'v5.1-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/arm/rockchip.yaml          |  17 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/rk3036-kylin.dts                 |   1 -
 arch/arm/boot/dts/rk3036.dtsi                      |   1 +
 arch/arm/boot/dts/rk3066a.dtsi                     |  48 ++
 arch/arm/boot/dts/rk3188-bqedison2qc.dts           |  17 +-
 arch/arm/boot/dts/rk3188.dtsi                      |   1 -
 arch/arm/boot/dts/rv1108-elgin-r1.dts              | 206 +++++++
 arch/arm/boot/dts/rv1108.dtsi                      |  37 ++
 arch/arm64/boot/dts/rockchip/Makefile              |   3 +
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |  26 +-
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           |  14 +
 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts  |  91 +++
 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts  |  66 ++
 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi   | 677 +++++++++++++++++++++
 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts  | 606 ++++++++++++++++++
 drivers/clk/rockchip/clk-rk3188.c                  |   4 +-
 drivers/clk/rockchip/clk-rk3328.c                  |  12 +-
 19 files changed, 1816 insertions(+), 13 deletions(-)
 create mode 100644 arch/arm/boot/dts/rv1108-elgin-r1.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-m4.dts
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
 create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
Merging samsung/for-next (bebc6082da0a Linux 4.14)
$ git merge samsung/for-next
Already up to date.
Merging samsung-krzk/for-next (2e625e23d6bf Merge branch 'next/defconfig' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi |  1 -
 arch/arm/boot/dts/exynos4412-odroidx.dts        |  2 +-
 arch/arm/boot/dts/exynos5250-arndale.dts        |  2 +-
 arch/arm/boot/dts/s3c2416-smdk2416.dts          |  5 +-
 arch/arm/boot/dts/s5pv210-aries.dtsi            | 90 +++++++++++++++++++++++++
 arch/arm/boot/dts/s5pv210-fascinate4g.dts       |  7 --
 arch/arm/boot/dts/s5pv210-galaxys.dts           |  7 --
 arch/arm/boot/dts/s5pv210.dtsi                  | 25 ++++++-
 arch/arm/configs/s5pv210_defconfig              | 47 ++++++++++---
 arch/arm/mach-s3c24xx/mach-osiris-dvs.c         |  8 +--
 10 files changed, 159 insertions(+), 35 deletions(-)
Merging sunxi/sunxi/for-next (69ac2faf3bc9 Merge branch 'sunxi/fixes-for-5.0' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/sun4i-a10.dtsi                   |  5 +++
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  1 +
 arch/arm/boot/dts/sun7i-a20-bananapi.dts           |  5 +++
 arch/arm/boot/dts/sun8i-h3-beelink-x2.dts          |  2 +-
 arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts  | 41 ++++++++++++++++++++++
 arch/arm/boot/dts/sun8i-r40.dtsi                   | 15 ++++++++
 arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi      | 16 ++++++++-
 .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts |  1 +
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      | 11 +++++-
 9 files changed, 94 insertions(+), 3 deletions(-)
Merging tegra/for-next (2731820ce27b Merge branch for-4.21/clk into for-next)
$ git merge tegra/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging clk/clk-next (1f7e1389516e Merge branch 'clk-fixes' into clk-next)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/fixed-mmio-clock.txt |  24 +++
 .../devicetree/bindings/clock/qcom,rpmcc.txt       |   1 +
 drivers/clk/Kconfig                                |   7 +-
 drivers/clk/Makefile                               |   1 +
 drivers/clk/at91/sama5d2.c                         |   3 +-
 drivers/clk/clk-clps711x.c                         |  61 ++-----
 drivers/clk/clk-fixed-mmio.c                       | 101 +++++++++++
 drivers/clk/clk-highbank.c                         |   1 +
 drivers/clk/clk-qoriq.c                            |   1 +
 drivers/clk/clk-versaclock5.c                      |   4 +-
 drivers/clk/clk.c                                  |   2 +-
 drivers/clk/imx/clk-composite-8m.c                 |   2 +-
 drivers/clk/imx/clk-imx6q.c                        |   1 +
 drivers/clk/imx/clk-imx6sx.c                       |   1 +
 drivers/clk/imx/clk-imx7d.c                        |   1 +
 drivers/clk/imx/clk-imx8mq.c                       | 194 ++++++++++-----------
 drivers/clk/imx/clk-imx8qxp-lpcg.c                 |   2 +
 drivers/clk/imx/clk-vf610.c                        |   1 +
 drivers/clk/imx/clk.h                              |   5 +-
 drivers/clk/mvebu/armada-370.c                     |   4 +-
 drivers/clk/mvebu/armada-xp.c                      |   4 +-
 drivers/clk/mvebu/dove.c                           |   8 +-
 drivers/clk/mvebu/kirkwood.c                       |   2 +
 drivers/clk/mvebu/mv98dx3236.c                     |   4 +-
 drivers/clk/qcom/Kconfig                           |   1 +
 drivers/clk/qcom/clk-smd-rpm.c                     |  63 +++++++
 drivers/clk/qcom/gcc-msm8998.c                     |  51 +++++-
 drivers/clk/samsung/clk-exynos4.c                  |   1 +
 drivers/clk/socfpga/clk-pll-a10.c                  |   1 +
 drivers/clk/socfpga/clk-pll-s10.c                  |   2 +-
 drivers/clk/socfpga/clk-pll.c                      |   1 +
 drivers/clk/socfpga/clk-s10.c                      |  20 +--
 drivers/clk/tegra/clk-tegra124-dfll-fcpu.c         |   4 +-
 drivers/clk/ti/clk.c                               |   8 +-
 drivers/clk/zynqmp/clkc.c                          |   4 +-
 include/dt-bindings/clock/qcom,rpmcc.h             |  10 ++
 36 files changed, 425 insertions(+), 176 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/fixed-mmio-clock.txt
 create mode 100644 drivers/clk/clk-fixed-mmio.c
Merging clk-samsung/for-next (bfeffd155283 Linux 5.0-rc1)
$ git merge clk-samsung/for-next
Already up to date.
Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge c6x/for-linux-next
Already up to date.
Merging csky/linux-next (8e16960b1519 csky: Optimize remove unnecessary loop irq handle)
$ git merge csky/linux-next
Merge made by the 'recursive' strategy.
 .../interrupt-controller/csky,apb-intc.txt         |   1 +
 .../bindings/interrupt-controller/csky,mpintc.txt  |  24 +++-
 arch/csky/include/asm/pgtable.h                    |   4 +-
 drivers/irqchip/irq-csky-apb-intc.c                | 131 ++++++++++++++++-----
 drivers/irqchip/irq-csky-mpintc.c                  |  86 ++++++++++++--
 5 files changed, 207 insertions(+), 39 deletions(-)
Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq)
$ git merge h8300/h8300-next
Already up to date.
Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
$ git merge ia64/next
Already up to date.
Merging m68k/for-next (005e13a96c0e m68k: Generate uapi header and syscall table header files)
$ git merge m68k/for-next
Already up to date.
Merging m68knommu/for-next (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge m68knommu/for-next
Already up to date.
Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions)
$ git merge microblaze/next
Merge made by the 'recursive' strategy.
 arch/microblaze/kernel/setup.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
Merging mips/mips-next (adcc81f148d7 MIPS: math-emu: Write-protect delay slot emulation pages)
$ git merge mips/mips-next
Already up to date.
Merging nds32/next (bfeffd155283 Linux 5.0-rc1)
$ git merge nds32/next
Already up to date.
Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE)
$ git merge nios2/for-next
Auto-merging arch/nios2/Kconfig
Merge made by the 'recursive' strategy.
 arch/nios2/Kconfig                   |   1 -
 arch/nios2/include/asm/pgtable.h     |   1 -
 arch/nios2/include/asm/tlbflush.h    |  19 +++-
 arch/nios2/kernel/nios2_ksyms.c      |  12 +++
 arch/nios2/mm/cacheflush.c           |   7 +-
 arch/nios2/mm/fault.c                |   2 +-
 arch/nios2/mm/tlb.c                  | 191 ++++++++++++++++++++---------------
 arch/nios2/platform/Kconfig.platform |   9 --
 8 files changed, 141 insertions(+), 101 deletions(-)
Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32)
$ git merge openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (0c1d7fc698da CREDITS/MAINTAINERS: Adjust parisc-linux.org email addresses)
$ git merge parisc-hd/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 CREDITS                                   | 20 +++++++++-----------
 MAINTAINERS                               |  7 +++----
 arch/parisc/boot/Makefile                 |  6 ------
 arch/parisc/include/asm/hardirq.h         |  1 +
 arch/parisc/kernel/irq.c                  | 19 ++++++++++++++-----
 arch/parisc/kernel/smp.c                  |  1 +
 arch/parisc/kernel/syscall.S              |  2 +-
 arch/parisc/kernel/syscalls/syscalltbl.sh |  4 ++--
 arch/parisc/kernel/traps.c                |  4 ++--
 drivers/parisc/lba_pci.c                  | 12 ++++++++++++
 10 files changed, 45 insertions(+), 31 deletions(-)
Merging powerpc/next (bfeffd155283 Linux 5.0-rc1)
$ git merge powerpc/next
Already up to date.
Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask")
$ git merge fsl/next
Already up to date.
Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge risc-v-pjw/for-next
Already up to date.
Merging risc-v/for-next (801009424e05 Fix a handful of audit-related issue)
$ git merge risc-v/for-next
Already up to date.
Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
$ git merge sifive/for-next
Already up to date.
Merging s390/features (a28028959ea8 s390/hypfs: Use struct_size() in kzalloc())
$ git merge s390/features
Merge made by the 'recursive' strategy.
 arch/s390/boot/string.c             |  1 +
 arch/s390/hypfs/hypfs_diag0c.c      |  3 +--
 arch/s390/include/asm/mmu_context.h |  7 +++----
 arch/s390/include/asm/string.h      | 28 ++++++++++++++++++++++------
 arch/s390/kernel/early.c            |  4 ++--
 arch/s390/kernel/setup.c            |  2 ++
 arch/s390/kernel/smp.c              | 11 ++++++++++-
 arch/s390/kernel/vdso.c             |  5 ++---
 arch/s390/lib/string.c              | 28 ++++++++++++++++++++++++++++
 arch/s390/mm/pgtable.c              |  2 --
 drivers/s390/char/sclp_config.c     |  2 ++
 11 files changed, 73 insertions(+), 20 deletions(-)
Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge sparc-next/master
Already up to date.
Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
$ git merge sh/for-next
Already up to date.
Merging uml/linux-next (940b241d9050 um: Remove obsolete reenable_XX calls)
$ git merge uml/linux-next
Already up to date.
Merging xtensa/xtensa-for-next (f1589f675d65 Merge branch 'xtensa-jumplabel' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging fscrypt/master (cc0146d0bce0 fscrypt: remove CRYPTO_CTR dependency)
$ git merge fscrypt/master
Auto-merging include/uapi/linux/fs.h
Removing include/linux/fscrypt_supp.h
Removing include/linux/fscrypt_notsupp.h
Auto-merging include/linux/fs.h
Auto-merging fs/ubifs/sb.c
Auto-merging fs/ubifs/Kconfig
CONFLICT (content): Merge conflict in fs/ubifs/Kconfig
Auto-merging fs/f2fs/sysfs.c
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/namei.c
Auto-merging fs/f2fs/inode.c
Auto-merging fs/f2fs/file.c
Auto-merging fs/f2fs/f2fs.h
Auto-merging fs/f2fs/dir.c
CONFLICT (content): Merge conflict in fs/f2fs/dir.c
Auto-merging fs/f2fs/data.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/readpage.c
Auto-merging fs/ext4/page-io.c
Auto-merging fs/ext4/namei.c
Auto-merging fs/ext4/ioctl.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/ext4/ialloc.c
Auto-merging fs/ext4/ext4.h
Auto-merging fs/crypto/fscrypt_private.h
Auto-merging arch/mips/configs/generic_defconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Auto-merging Documentation/filesystems/index.rst
CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
Auto-merging Documentation/filesystems/fscrypt.rst
Resolved 'Documentation/filesystems/index.rst' using previous resolution.
Resolved 'fs/f2fs/dir.c' using previous resolution.
Resolved 'fs/ubifs/Kconfig' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master dd9a5c0b2f75] Merge remote-tracking branch 'fscrypt/master'
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/fscrypt.rst   |   4 +-
 Documentation/filesystems/fsverity.rst  | 583 ++++++++++++++++++++
 Documentation/filesystems/index.rst     |  11 +
 Documentation/ioctl/ioctl-number.txt    |   1 +
 MAINTAINERS                             |  12 +
 arch/mips/configs/generic_defconfig     |   2 +-
 arch/nds32/configs/defconfig            |   2 +-
 arch/s390/configs/debug_defconfig       |   2 +-
 arch/s390/configs/performance_defconfig |   2 +-
 fs/Kconfig                              |   2 +
 fs/Makefile                             |   1 +
 fs/crypto/Kconfig                       |   6 +-
 fs/crypto/fscrypt_private.h             |   1 -
 fs/ext4/Kconfig                         |  15 -
 fs/ext4/dir.c                           |  10 +-
 fs/ext4/ext4.h                          |  23 +-
 fs/ext4/ext4_jbd2.h                     |   2 +-
 fs/ext4/extents.c                       |   4 +-
 fs/ext4/file.c                          |   4 +
 fs/ext4/ialloc.c                        |   2 +-
 fs/ext4/inode.c                         |  37 +-
 fs/ext4/ioctl.c                         |  16 +-
 fs/ext4/move_extent.c                   |   3 +-
 fs/ext4/namei.c                         |  18 +-
 fs/ext4/page-io.c                       |   9 +-
 fs/ext4/readpage.c                      | 211 ++++++--
 fs/ext4/super.c                         | 107 +++-
 fs/ext4/sysfs.c                         |  10 +-
 fs/f2fs/Kconfig                         |  12 +-
 fs/f2fs/data.c                          |  47 +-
 fs/f2fs/dir.c                           |  10 +-
 fs/f2fs/f2fs.h                          |  24 +-
 fs/f2fs/file.c                          |  64 ++-
 fs/f2fs/inode.c                         |  11 +-
 fs/f2fs/namei.c                         |   6 +-
 fs/f2fs/super.c                         |  39 +-
 fs/f2fs/sysfs.c                         |  15 +-
 fs/ubifs/Kconfig                        |  13 +-
 fs/ubifs/Makefile                       |   2 +-
 fs/ubifs/ioctl.c                        |   4 +-
 fs/ubifs/sb.c                           |   2 +-
 fs/ubifs/super.c                        |   2 +-
 fs/ubifs/ubifs.h                        |   5 +-
 fs/verity/Kconfig                       |  53 ++
 fs/verity/Makefile                      |   5 +
 fs/verity/fsverity_private.h            | 134 +++++
 fs/verity/hash_algs.c                   | 115 ++++
 fs/verity/ioctl.c                       | 164 ++++++
 fs/verity/setup.c                       | 911 ++++++++++++++++++++++++++++++++
 fs/verity/signature.c                   | 187 +++++++
 fs/verity/verify.c                      | 298 +++++++++++
 include/linux/fs.h                      |  15 +-
 include/linux/fscrypt.h                 | 416 ++++++++++++++-
 include/linux/fscrypt_notsupp.h         | 231 --------
 include/linux/fscrypt_supp.h            | 204 -------
 include/linux/fsverity.h                | 111 ++++
 include/uapi/linux/fsverity.h           |  98 ++++
 57 files changed, 3665 insertions(+), 633 deletions(-)
 create mode 100644 Documentation/filesystems/fsverity.rst
 create mode 100644 fs/verity/Kconfig
 create mode 100644 fs/verity/Makefile
 create mode 100644 fs/verity/fsverity_private.h
 create mode 100644 fs/verity/hash_algs.c
 create mode 100644 fs/verity/ioctl.c
 create mode 100644 fs/verity/setup.c
 create mode 100644 fs/verity/signature.c
 create mode 100644 fs/verity/verify.c
 delete mode 100644 include/linux/fscrypt_notsupp.h
 delete mode 100644 include/linux/fscrypt_supp.h
 create mode 100644 include/linux/fsverity.h
 create mode 100644 include/uapi/linux/fsverity.h
Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
 fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 46 deletions(-)
Merging btrfs/next (29dcea88779c Linux 4.17)
$ git merge btrfs/next
Already up to date.
Merging btrfs-kdave/for-next (0078a3f8bf05 Merge branch 'for-next-current-v4.19-20181219' into for-next-20181219)
$ git merge btrfs-kdave/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging ceph/master (85f5a4d666fd rbd: don't return 0 on unmap if RBD_DEV_FLAG_REMOVING is set)
$ git merge ceph/master
Already up to date.
Merging cifs/for-next (cb891e7a35b9 cifs: fix memory leak of an allocated cifs_ntsd structure)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/smb2pdu.c | 8 ++++++++
 1 file changed, 8 insertions(+)
Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
$ git merge configfs/for-next
Already up to date.
Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
Merging ext3/for_next (3f0216106126 Pull quota locking fix.)
$ git merge ext3/for_next
Auto-merging include/linux/fs.h
Auto-merging fs/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS              |   1 +
 fs/Makefile              |   3 +-
 fs/ext2/dir.c            |  49 +++++++++-------------
 fs/fs_types.c            | 105 +++++++++++++++++++++++++++++++++++++++++++++++
 include/linux/fs.h       |  17 +-------
 include/linux/fs_types.h |  73 ++++++++++++++++++++++++++++++++
 6 files changed, 202 insertions(+), 46 deletions(-)
 create mode 100644 fs/fs_types.c
 create mode 100644 include/linux/fs_types.h
Merging ext4/dev (191ce17876c9 ext4: fix special inode number checks in __ext4_iget())
$ git merge ext4/dev
Already up to date.
Merging f2fs/dev (cd2dcebde8b8 f2fs: sync filesystem after roll-forward recovery)
$ git merge f2fs/dev
Auto-merging fs/f2fs/sysfs.c
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/file.c
Auto-merging fs/f2fs/f2fs.h
Auto-merging fs/f2fs/dir.c
Auto-merging fs/f2fs/data.c
Merge made by the 'recursive' strategy.
 fs/f2fs/data.c              |  5 +----
 fs/f2fs/debug.c             | 19 ++++++++++++-------
 fs/f2fs/dir.c               |  3 ++-
 fs/f2fs/f2fs.h              |  3 ++-
 fs/f2fs/file.c              | 14 +++++++++-----
 fs/f2fs/super.c             | 15 ++++++++++++---
 fs/f2fs/sysfs.c             |  2 ++
 include/trace/events/f2fs.h |  3 +++
 8 files changed, 43 insertions(+), 21 deletions(-)
Merging fuse/for-next (cc4249fdc6c9 fuse: use atomic64_t for khctr)
$ git merge fuse/for-next
Merge made by the 'recursive' strategy.
 fs/fuse/control.c |   4 +-
 fs/fuse/cuse.c    |   7 +-
 fs/fuse/dev.c     | 119 ++++++++++++++++++-------------
 fs/fuse/dir.c     |  54 ++++++--------
 fs/fuse/file.c    | 208 ++++++++++++++++++++++++++++--------------------------
 fs/fuse/fuse_i.h  |  25 ++++---
 fs/fuse/inode.c   |  25 ++++---
 fs/fuse/readdir.c |   4 +-
 8 files changed, 238 insertions(+), 208 deletions(-)
Merging jfs/jfs-next (2e3bc6125154 fs/jfs: Switch to use new generic UUID API)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
 fs/jfs/acl.c            |  3 ++-
 fs/jfs/jfs_incore.h     |  6 ++++--
 fs/jfs/jfs_logmgr.c     | 18 +++++++++---------
 fs/jfs/jfs_logmgr.h     | 10 +++++-----
 fs/jfs/jfs_mount.c      |  4 ++--
 fs/jfs/jfs_superblock.h |  8 ++++----
 fs/jfs/namei.c          |  2 +-
 fs/jfs/super.c          |  8 +++++---
 8 files changed, 32 insertions(+), 27 deletions(-)
Merging nfs/linux-next (3bd6e94bec12 arch: restore generic-y += shmparam.h for some architectures)
$ git merge nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (deaa5c96c2f7 SUNRPC: Address Kerberos performance/behavior regression)
$ git merge nfs-anna/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/nfs4file.c              |  8 +-------
 net/sunrpc/auth.c              |  3 +++
 net/sunrpc/auth_gss/auth_gss.c | 12 +++++++++---
 net/sunrpc/clnt.c              | 20 ++++++++++++--------
 net/sunrpc/xprt.c              |  3 ++-
 net/sunrpc/xprtrdma/verbs.c    | 10 ++++------
 net/sunrpc/xprtsock.c          | 22 ++++++++++++++++++++++
 7 files changed, 53 insertions(+), 25 deletions(-)
Merging nfsd/nfsd-next (978c707df559 svcrdma: Use struct_size() in kmalloc())
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
 fs/nfsd/nfs4callback.c                  |  4 ++--
 net/sunrpc/svc_xprt.c                   | 24 +++++++++++++++++++-----
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c |  3 ++-
 net/sunrpc/xprtrdma/svc_rdma_rw.c       |  6 +++---
 4 files changed, 26 insertions(+), 11 deletions(-)
Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
$ git merge orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (2424e1c7256c overlayfs: During copy up, first copy up data and then xattrs)
$ git merge overlayfs/overlayfs-next
Merge made by the 'recursive' strategy.
 fs/overlayfs/copy_up.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
Merging ubifs/linux-next (e58725d51fa8 ubifs: Handle re-linking of inodes correctly while recovery)
$ git merge ubifs/linux-next
Already up to date.
Merging v9fs/9p-next (574d356b7a02 9p/net: put a lower bound on msize)
$ git merge v9fs/9p-next
Already up to date.
Merging xfs/for-next (90be9b86da90 xfs: xfs_fsops: drop useless LIST_HEAD)
$ git merge xfs/for-next
Already up to date.
Merging file-locks/locks-next (bf77ae4c98d7 locks: fix error in locks_move_blocks())
$ git merge file-locks/locks-next
Already up to date.
Merging vfs/for-next (1fab5fff0a7a Merge branches 'work.mount', 'work.misc', 'misc.misc' and 'work.iov_iter' into for-next)
$ git merge vfs/for-next
Auto-merging security/smack/smack_lsm.c
Auto-merging security/selinux/include/security.h
Auto-merging security/selinux/hooks.c
Auto-merging security/security.c
Auto-merging kernel/cgroup/cpuset.c
Auto-merging kernel/cgroup/cgroup.c
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup.c
Auto-merging kernel/cgroup/cgroup-v1.c
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-v1.c
Auto-merging kernel/cgroup/cgroup-internal.h
CONFLICT (content): Merge conflict in kernel/cgroup/cgroup-internal.h
Auto-merging include/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Auto-merging include/linux/cgroup.h
Auto-merging fs/proc/inode.c
Auto-merging fs/namespace.c
Auto-merging fs/namei.c
Auto-merging fs/kernfs/mount.c
Auto-merging fs/Makefile
CONFLICT (content): Merge conflict in fs/Makefile
Auto-merging fs/Kconfig
Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c
Auto-merging arch/x86/kernel/cpu/resctrl/internal.h
Resolved 'arch/x86/kernel/cpu/resctrl/rdtgroup.c' using previous resolution.
Resolved 'fs/Makefile' using previous resolution.
Resolved 'include/linux/fs.h' using previous resolution.
Resolved 'kernel/cgroup/cgroup-internal.h' using previous resolution.
Resolved 'kernel/cgroup/cgroup-v1.c' using previous resolution.
Resolved 'kernel/cgroup/cgroup.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 486954c1db51] Merge remote-tracking branch 'vfs/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/mount_api.txt | 709 ++++++++++++++++++++++++++++++++
 arch/x86/kernel/cpu/resctrl/internal.h  |  16 +
 arch/x86/kernel/cpu/resctrl/rdtgroup.c  | 194 +++++----
 fs/Kconfig                              |   7 +
 fs/Makefile                             |   2 +-
 fs/afs/internal.h                       |   9 +-
 fs/afs/mntpt.c                          | 149 +++----
 fs/afs/super.c                          | 439 ++++++++++----------
 fs/afs/volume.c                         |   4 +-
 fs/filesystems.c                        |   4 +
 fs/fs_context.c                         | 646 +++++++++++++++++++++++++++++
 fs/fs_parser.c                          | 555 +++++++++++++++++++++++++
 fs/hugetlbfs/inode.c                    | 371 ++++++++++-------
 fs/internal.h                           |  13 +-
 fs/kernfs/kernfs-internal.h             |   1 +
 fs/kernfs/mount.c                       |  87 ++--
 fs/namei.c                              |   4 +-
 fs/namespace.c                          | 262 ++++++++----
 fs/proc/inode.c                         |  52 +--
 fs/proc/internal.h                      |   5 +-
 fs/proc/root.c                          | 244 ++++++++---
 fs/super.c                              | 344 +++++++++++++---
 fs/sysfs/mount.c                        |  73 +++-
 include/linux/cgroup.h                  |   3 +-
 include/linux/errno.h                   |   1 +
 include/linux/fs.h                      |  14 +-
 include/linux/fs_context.h              | 181 ++++++++
 include/linux/fs_parser.h               | 119 ++++++
 include/linux/kernfs.h                  |  40 +-
 include/linux/lsm_hooks.h               |  21 +
 include/linux/mount.h                   |   3 +
 include/linux/security.h                |  18 +-
 ipc/mqueue.c                            |  94 ++++-
 ipc/namespace.c                         |   2 +-
 kernel/cgroup/cgroup-internal.h         |  52 ++-
 kernel/cgroup/cgroup-v1.c               | 407 ++++++++++--------
 kernel/cgroup/cgroup.c                  | 262 +++++++-----
 kernel/cgroup/cpuset.c                  |  56 ++-
 security/security.c                     |  10 +
 security/selinux/hooks.c                |  99 ++++-
 security/selinux/include/security.h     |  10 +-
 security/smack/smack.h                  |  20 +-
 security/smack/smack_lsm.c              | 103 ++++-
 43 files changed, 4482 insertions(+), 1223 deletions(-)
 create mode 100644 Documentation/filesystems/mount_api.txt
 create mode 100644 fs/fs_context.c
 create mode 100644 fs/fs_parser.c
 create mode 100644 include/linux/fs_context.h
 create mode 100644 include/linux/fs_parser.h
$ git am -3 ../patches/0001-vfs-work-around-CONFIG_PRINTK-n-in-fs_context-loggin.patch
Applying: vfs: work around CONFIG_PRINTK=n in fs_context logging code
$ git reset HEAD^
Unstaged changes after reset:
M	fs/fs_context.c
$ git add -A .
$ git commit -v -a --amend
[master 6f6a29b5dd3c] Merge remote-tracking branch 'vfs/for-next'
 Date: Fri Jan 18 09:52:37 2019 +1100
Merging printk/for-next (15ff2069cb7f printk: Add caller information to printk() output.)
$ git merge printk/for-next
Auto-merging lib/Kconfig.debug
Auto-merging kernel/printk/printk.c
Merge made by the 'recursive' strategy.
 kernel/printk/printk.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++----
 lib/Kconfig.debug      | 17 ++++++++++++++++
 2 files changed, 68 insertions(+), 4 deletions(-)
Merging pci/next (4cd74d833a4d Merge branch 'pci/misc')
$ git merge pci/next
Auto-merging drivers/pci/pci.c
Merge made by the 'recursive' strategy.
 drivers/pci/hotplug/pciehp_hpc.c | 2 +-
 drivers/pci/pci.c                | 4 ++--
 drivers/pci/quirks.c             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
Merging pstore/for-next/pstore (8665569e97dd pstore/ram: Avoid NULL deref in ftrace merging failure path)
$ git merge pstore/for-next/pstore
Already up to date.
Merging hid/for-next (0a84e89382d6 Merge branch 'for-5.0/upstream-fixes' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 drivers/hid/Kconfig                |   7 ++
 drivers/hid/Makefile               |   1 +
 drivers/hid/hid-core.c             |  23 +++---
 drivers/hid/hid-ids.h              |   4 +
 drivers/hid/hid-maltron.c          | 165 +++++++++++++++++++++++++++++++++++++
 drivers/hid/hid-sony.c             |  31 ++++---
 drivers/hid/i2c-hid/i2c-hid-core.c |   2 +
 include/linux/hid.h                |   3 +-
 8 files changed, 213 insertions(+), 23 deletions(-)
 create mode 100644 drivers/hid/hid-maltron.c
Merging i2c/i2c/for-next (b33a02aadcc6 i2c: acpi: Move I2C bits from acpi.h to i2c.h)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
 Documentation/i2c/fault-codes      |  4 ++++
 drivers/i2c/busses/i2c-brcmstb.c   | 13 ++---------
 drivers/i2c/busses/i2c-exynos5.c   | 11 ++--------
 drivers/i2c/busses/i2c-imx.c       | 37 +++++++++++++++++++-------------
 drivers/i2c/busses/i2c-rcar.c      | 25 ++++++++++++++++++++++
 drivers/i2c/busses/i2c-s3c2410.c   |  8 ++-----
 drivers/i2c/busses/i2c-sprd.c      | 34 +++++++++++------------------
 drivers/i2c/busses/i2c-synquacer.c |  5 -----
 drivers/i2c/busses/i2c-zx2967.c    |  8 ++-----
 drivers/i2c/i2c-core-base.c        |  3 +++
 include/linux/acpi.h               | 11 ----------
 include/linux/i2c.h                | 44 ++++++++++++++++++++++++++++++++++++++
 12 files changed, 118 insertions(+), 85 deletions(-)
Merging i3c/i3c/next (25ac3da61ba1 i3c: master: cdns: fix I2C transfers in Cadence I3C master driver)
$ git merge i3c/i3c/next
Already up to date.
Merging dmi/master (57361846b52b Linux 4.19-rc2)
$ git merge dmi/master
Already up to date.
Merging hwmon-staging/hwmon-next (554d08277810 hwmon: (ltc4245) Replace S_<PERMS> with octal values)
$ git merge hwmon-staging/hwmon-next
Auto-merging drivers/hwmon/lm80.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/dps650ab.txt         |  11 +
 .../devicetree/bindings/hwmon/hih6130.txt          |  12 +
 drivers/hwmon/adt7462.c                            |   4 +
 drivers/hwmon/dell-smm-hwmon.c                     |  97 +++-
 drivers/hwmon/gl518sm.c                            | 120 ++--
 drivers/hwmon/gl520sm.c                            | 184 +++---
 drivers/hwmon/gpio-fan.c                           |   2 +-
 drivers/hwmon/hih6130.c                            |  21 +-
 drivers/hwmon/hwmon.c                              |   4 +-
 drivers/hwmon/i5500_temp.c                         |  14 +-
 drivers/hwmon/i5k_amb.c                            |  12 +-
 drivers/hwmon/ibmaem.c                             |  15 +-
 drivers/hwmon/ibmpex.c                             |  14 +-
 drivers/hwmon/iio_hwmon.c                          |   2 +-
 drivers/hwmon/ina209.c                             | 151 +++--
 drivers/hwmon/ina3221.c                            |  17 +-
 drivers/hwmon/jc42.c                               |   8 +-
 drivers/hwmon/k8temp.c                             |  12 +-
 drivers/hwmon/lineage-pem.c                        |  77 ++-
 drivers/hwmon/lm73.c                               |  34 +-
 drivers/hwmon/lm75.c                               |   6 +-
 drivers/hwmon/lm77.c                               |  45 +-
 drivers/hwmon/lm80.c                               | 138 ++---
 drivers/hwmon/lm83.c                               |  62 +-
 drivers/hwmon/lm90.c                               |  12 +-
 drivers/hwmon/lm92.c                               |  39 +-
 drivers/hwmon/lm93.c                               | 630 +++++++++------------
 drivers/hwmon/lm95241.c                            |   8 +-
 drivers/hwmon/lm95245.c                            |   8 +-
 drivers/hwmon/ltc2990.c                            |  32 +-
 drivers/hwmon/ltc4151.c                            |  11 +-
 drivers/hwmon/ltc4222.c                            |  56 +-
 drivers/hwmon/ltc4245.c                            |   8 +-
 drivers/hwmon/pmbus/pmbus.c                        |  64 ++-
 34 files changed, 913 insertions(+), 1017 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/dps650ab.txt
 create mode 100644 Documentation/devicetree/bindings/hwmon/hih6130.txt
Merging jc_docs/docs-next (be5cd20c9b49 kernel-doc: suppress 'not described' warnings for embedded struct fields)
$ git merge jc_docs/docs-next
Removing Documentation/networking/checksum-offloads.txt
Auto-merging Documentation/filesystems/index.rst
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/tainted-kernels.rst      | 159 +++-
 Documentation/cgroup-v1/memory.txt                 |   7 +-
 Documentation/core-api/kernel-api.rst              |   4 -
 Documentation/core-api/memory-allocation.rst       |   8 +-
 Documentation/core-api/mm-api.rst                  |   2 +-
 Documentation/dev-tools/kcov.rst                   |   2 +-
 Documentation/doc-guide/sphinx.rst                 |  12 +-
 Documentation/fault-injection/fault-injection.txt  |   2 +-
 Documentation/filesystems/binderfs.rst             |  68 ++
 Documentation/filesystems/index.rst                |   7 +
 Documentation/filesystems/path-lookup.rst          |  24 +-
 Documentation/hwmon/f71882fg                       |   2 +-
 Documentation/index.rst                            |   1 +
 Documentation/misc-devices/ibmvmc.rst              |   1 +
 Documentation/misc-devices/index.rst               |  17 +
 Documentation/networking/checksum-offloads.rst     | 143 ++++
 Documentation/networking/checksum-offloads.txt     | 122 ---
 Documentation/networking/index.rst                 |   2 +
 ...tion-offloads.txt => segmentation-offloads.rst} |  48 +-
 Documentation/process/coding-style.rst             |  59 +-
 Documentation/sysctl/kernel.txt                    |  50 +-
 Documentation/sysctl/vm.txt                        |   2 +-
 .../translations/it_IT/process/coding-style.rst    |  57 +-
 .../it_IT/process/submitting-patches.rst           | 862 ++++++++++++++++++++-
 Documentation/translations/zh_CN/coding-style.rst  |  57 +-
 LICENSES/exceptions/GCC-exception-2.0              |  18 +
 include/linux/skbuff.h                             |   2 +-
 samples/Kconfig                                    |   7 +
 samples/Makefile                                   |   2 +-
 samples/binderfs/Makefile                          |   1 +
 samples/binderfs/binderfs_example.c                |  83 ++
 scripts/kernel-doc                                 |   2 +-
 scripts/spdxcheck.py                               |   8 +-
 tools/Makefile                                     |  14 +-
 tools/debugging/Makefile                           |  16 +
 tools/debugging/kernel-chktaint                    | 202 +++++
 36 files changed, 1771 insertions(+), 302 deletions(-)
 create mode 100644 Documentation/filesystems/binderfs.rst
 create mode 100644 Documentation/misc-devices/index.rst
 create mode 100644 Documentation/networking/checksum-offloads.rst
 delete mode 100644 Documentation/networking/checksum-offloads.txt
 rename Documentation/networking/{segmentation-offloads.txt => segmentation-offloads.rst} (88%)
 create mode 100644 LICENSES/exceptions/GCC-exception-2.0
 create mode 100644 samples/binderfs/Makefile
 create mode 100644 samples/binderfs/binderfs_example.c
 create mode 100644 tools/debugging/Makefile
 create mode 100755 tools/debugging/kernel-chktaint
Merging v4l-dvb/master (e8f9b16d7263 media: remove soc_camera ov9640)
$ git merge v4l-dvb/master
Auto-merging drivers/media/platform/vim2m.c
Auto-merging drivers/media/pci/intel/ipu3/ipu3-cio2.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/media/i2c/adv748x.txt      |  11 +-
 .../devicetree/bindings/media/i2c/ov5645.txt       |   6 +-
 .../devicetree/bindings/media/rcar_vin.txt         |   9 +-
 .../bindings/media/renesas,rcar-csi2.txt           |   3 +-
 .../devicetree/bindings/media/sun6i-csi.txt        |   2 +-
 Documentation/media/uapi/v4l/buffer.rst            |  11 +-
 Documentation/media/uapi/v4l/extended-controls.rst |  37 ++--
 .../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst      |  25 ++-
 Documentation/media/v4l-drivers/imx.rst            | 103 ++++++----
 Documentation/media/v4l-drivers/ipu3.rst           |   4 +-
 MAINTAINERS                                        |  11 +-
 drivers/gpu/ipu-v3/ipu-cpmem.c                     |  26 ++-
 drivers/gpu/ipu-v3/ipu-csi.c                       | 126 +++++++++----
 drivers/media/common/saa7146/saa7146_i2c.c         |   5 +-
 drivers/media/common/videobuf2/videobuf2-dma-sg.c  |   2 +-
 drivers/media/common/videobuf2/videobuf2-v4l2.c    |  19 +-
 drivers/media/dvb-frontends/drxd_hard.c            |  30 +--
 drivers/media/dvb-frontends/lgdt3306a.c            |   5 +-
 drivers/media/dvb-frontends/lgdt330x.c             |   2 +-
 drivers/media/dvb-frontends/mt312.c                |   4 +-
 drivers/media/dvb-frontends/sp8870.c               |   4 +-
 drivers/media/i2c/Kconfig                          |   7 +
 drivers/media/i2c/Makefile                         |   1 +
 drivers/media/i2c/adv748x/adv748x-core.c           | 209 ++++++++++++---------
 drivers/media/i2c/adv748x/adv748x.h                |   1 +
 drivers/media/i2c/dw9714.c                         |   2 +-
 drivers/media/i2c/imx274.c                         |   2 +-
 drivers/media/i2c/ov2640.c                         |  45 ++++-
 drivers/media/i2c/ov5640.c                         |  58 ++++--
 drivers/media/i2c/ov7670.c                         |  16 +-
 .../i2c/{soc_camera/soc_ov9640.c => ov9640.c}      | 123 +++++++-----
 drivers/media/i2c/{soc_camera => }/ov9640.h        |   7 +-
 drivers/media/i2c/soc_camera/Kconfig               |   6 -
 drivers/media/i2c/soc_camera/Makefile              |   1 -
 drivers/media/i2c/tw9910.c                         |  27 +--
 drivers/media/pci/intel/ipu3/ipu3-cio2.c           |   5 +-
 drivers/media/platform/Kconfig                     |   2 +-
 drivers/media/platform/aspeed-video.c              |   1 +
 drivers/media/platform/coda/coda-bit.c             |   6 +-
 drivers/media/platform/coda/coda-common.c          |  11 ++
 drivers/media/platform/coda/coda.h                 |   2 +
 drivers/media/platform/rcar-vin/rcar-core.c        |  26 +--
 drivers/media/platform/rcar-vin/rcar-csi2.c        |  66 ++++---
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |  25 +--
 drivers/media/platform/s5p-jpeg/jpeg-core.h        |   2 +-
 drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.c      |   2 +-
 drivers/media/platform/s5p-jpeg/jpeg-hw-s5p.h      |   2 +-
 drivers/media/platform/s5p-jpeg/jpeg-regs.h        |   2 +-
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |   1 -
 drivers/media/platform/seco-cec/seco-cec.h         |   2 +-
 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c |   1 +
 drivers/media/platform/vicodec/codec-fwht.c        |   8 +-
 drivers/media/platform/vicodec/vicodec-core.c      |  12 +-
 drivers/media/platform/vim2m.c                     |  12 +-
 drivers/media/platform/vivid/vivid-core.c          |  22 ++-
 drivers/media/platform/vivid/vivid-vid-out.c       |  16 +-
 drivers/media/platform/vsp1/vsp1_video.c           |   2 +-
 drivers/media/spi/cxd2880-spi.c                    |   8 +-
 drivers/media/usb/gspca/cpia1.c                    |  14 +-
 drivers/media/usb/gspca/gspca.c                    |  18 +-
 drivers/media/usb/gspca/m5602/m5602_mt9m111.c      |   8 +-
 drivers/media/usb/gspca/m5602/m5602_po1030.c       |   8 +-
 drivers/media/usb/gspca/ov534.c                    | 153 ++++++++++-----
 drivers/media/usb/pwc/pwc-if.c                     |  69 +++++--
 drivers/media/usb/uvc/uvc_ctrl.c                   |   2 +-
 drivers/media/v4l2-core/v4l2-ctrls.c               |  14 +-
 drivers/media/v4l2-core/v4l2-mem2mem.c             |  20 ++
 drivers/staging/media/imx/imx-ic-prpencvf.c        |  46 ++++-
 drivers/staging/media/imx/imx-media-capture.c      |  14 ++
 drivers/staging/media/imx/imx-media-csi.c          | 156 +++++++++++----
 drivers/staging/media/imx/imx-media-vdic.c         |  12 +-
 drivers/staging/media/ipu3/ipu3-css-params.c       |   1 +
 drivers/staging/media/ipu3/ipu3-dmamap.c           |   1 +
 drivers/staging/media/sunxi/cedrus/cedrus.h        |   9 +-
 drivers/staging/media/sunxi/cedrus/cedrus_dec.c    |   2 +
 drivers/staging/media/sunxi/cedrus/cedrus_hw.c     |  28 +--
 drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c  |  23 ++-
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  |   8 +-
 include/media/mpeg2-ctrls.h                        |  14 +-
 include/media/v4l2-mem2mem.h                       |  20 ++
 include/media/videobuf2-dma-sg.h                   |   2 +-
 include/media/videobuf2-v4l2.h                     |  17 ++
 include/trace/events/pwc.h                         |  65 +++++++
 include/uapi/linux/v4l2-controls.h                 |   2 +
 include/uapi/linux/videodev2.h                     |  22 ++-
 include/video/imx-ipu-v3.h                         |   8 +-
 86 files changed, 1323 insertions(+), 619 deletions(-)
 rename drivers/media/i2c/{soc_camera/soc_ov9640.c => ov9640.c} (90%)
 rename drivers/media/i2c/{soc_camera => }/ov9640.h (96%)
 create mode 100644 include/trace/events/pwc.h
Merging v4l-dvb-next/master (76097fe1aee6 media: staging/ipu3-imgu: Add MAINTAINERS entry)
$ git merge v4l-dvb-next/master
Auto-merging drivers/staging/media/ipu3/ipu3-css-params.c
Auto-merging MAINTAINERS
Auto-merging Documentation/media/v4l-drivers/ipu3.rst
CONFLICT (add/add): Merge conflict in Documentation/media/v4l-drivers/ipu3.rst
Auto-merging Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
CONFLICT (add/add): Merge conflict in Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst
Resolved 'Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst' using previous resolution.
Resolved 'Documentation/media/v4l-drivers/ipu3.rst' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f609f3cedd6e] Merge remote-tracking branch 'v4l-dvb-next/master'
$ git diff -M --stat --summary HEAD^..
Merging fbdev/fbdev-for-next (890d14d2d4b5 fbdev: fbmem: convert CONFIG_FB_LOGO_CENTER into a cmd line option)
$ git merge fbdev/fbdev-for-next
Auto-merging drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c
Merge made by the 'recursive' strategy.
 Documentation/fb/fbcon.txt                      |  8 ++++++++
 drivers/video/fbdev/core/fbcon.c                |  7 +++++++
 drivers/video/fbdev/core/fbmem.c                | 19 ++++++++++---------
 drivers/video/fbdev/offb.c                      | 18 +++++++++---------
 drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c |  2 ++
 drivers/video/logo/Kconfig                      |  9 ---------
 include/linux/fb.h                              |  1 +
 7 files changed, 37 insertions(+), 27 deletions(-)
Merging pm/linux-next (4acbdd51bea2 Merge branch 'pm-core' into linux-next)
$ git merge pm/linux-next
Auto-merging MAINTAINERS
Removing Documentation/cpuidle/governor.txt
Removing Documentation/cpuidle/driver.txt
Merge made by the 'recursive' strategy.
 Documentation/acpi/initrd_table_override.txt       |   4 +
 Documentation/admin-guide/pm/cpuidle.rst           | 104 ++++-
 Documentation/cpuidle/driver.txt                   |  37 --
 Documentation/cpuidle/governor.txt                 |  28 --
 Documentation/driver-api/pm/cpuidle.rst            | 282 +++++++++++++
 Documentation/driver-api/pm/index.rst              |   7 +-
 MAINTAINERS                                        |   1 +
 arch/x86/Kconfig                                   |   2 +-
 drivers/acpi/Kconfig                               |  10 +
 drivers/acpi/Makefile                              |   3 +-
 drivers/acpi/acpica/acapps.h                       |   4 +-
 drivers/acpi/acpica/accommon.h                     |   2 +-
 drivers/acpi/acpica/acconvert.h                    |   2 +-
 drivers/acpi/acpica/acdebug.h                      |   2 +-
 drivers/acpi/acpica/acdispat.h                     |   2 +-
 drivers/acpi/acpica/acevents.h                     |   2 +-
 drivers/acpi/acpica/acglobal.h                     |   3 +-
 drivers/acpi/acpica/achware.h                      |   2 +-
 drivers/acpi/acpica/acinterp.h                     |   2 +-
 drivers/acpi/acpica/aclocal.h                      |   2 +-
 drivers/acpi/acpica/acmacros.h                     |   2 +-
 drivers/acpi/acpica/acnamesp.h                     |   2 +-
 drivers/acpi/acpica/acobject.h                     |   2 +-
 drivers/acpi/acpica/acopcode.h                     |   2 +-
 drivers/acpi/acpica/acparser.h                     |   2 +-
 drivers/acpi/acpica/acpredef.h                     |   2 +-
 drivers/acpi/acpica/acresrc.h                      |   2 +-
 drivers/acpi/acpica/acstruct.h                     |   2 +-
 drivers/acpi/acpica/actables.h                     |   2 +-
 drivers/acpi/acpica/acutils.h                      |   2 +-
 drivers/acpi/acpica/amlcode.h                      |   2 +-
 drivers/acpi/acpica/amlresrc.h                     |   2 +-
 drivers/acpi/acpica/dbhistry.c                     |   2 +-
 drivers/acpi/acpica/dsargs.c                       |   2 +-
 drivers/acpi/acpica/dscontrol.c                    |   2 +-
 drivers/acpi/acpica/dsdebug.c                      |   2 +-
 drivers/acpi/acpica/dsfield.c                      |   2 +-
 drivers/acpi/acpica/dsinit.c                       |   2 +-
 drivers/acpi/acpica/dsmethod.c                     |   2 +-
 drivers/acpi/acpica/dsobject.c                     |   2 +-
 drivers/acpi/acpica/dsopcode.c                     |  17 +-
 drivers/acpi/acpica/dspkginit.c                    |   2 +-
 drivers/acpi/acpica/dswexec.c                      |   2 +-
 drivers/acpi/acpica/dswload.c                      |   2 +-
 drivers/acpi/acpica/dswload2.c                     |   2 +-
 drivers/acpi/acpica/dswscope.c                     |   2 +-
 drivers/acpi/acpica/dswstate.c                     |   2 +-
 drivers/acpi/acpica/evevent.c                      |   2 +-
 drivers/acpi/acpica/evglock.c                      |   2 +-
 drivers/acpi/acpica/evgpe.c                        |   2 +-
 drivers/acpi/acpica/evgpeblk.c                     |   2 +-
 drivers/acpi/acpica/evgpeinit.c                    |   2 +-
 drivers/acpi/acpica/evgpeutil.c                    |   2 +-
 drivers/acpi/acpica/evhandler.c                    |   2 +-
 drivers/acpi/acpica/evmisc.c                       |   2 +-
 drivers/acpi/acpica/evregion.c                     |   2 +-
 drivers/acpi/acpica/evrgnini.c                     |   2 +-
 drivers/acpi/acpica/evxface.c                      |   2 +-
 drivers/acpi/acpica/evxfevnt.c                     |   2 +-
 drivers/acpi/acpica/evxfgpe.c                      |   2 +-
 drivers/acpi/acpica/evxfregn.c                     |   2 +-
 drivers/acpi/acpica/exconcat.c                     |   2 +-
 drivers/acpi/acpica/exconfig.c                     |   2 +-
 drivers/acpi/acpica/exconvrt.c                     |   2 +-
 drivers/acpi/acpica/excreate.c                     |   2 +-
 drivers/acpi/acpica/exdebug.c                      |   2 +-
 drivers/acpi/acpica/exdump.c                       |   2 +-
 drivers/acpi/acpica/exfield.c                      |   2 +-
 drivers/acpi/acpica/exfldio.c                      |   2 +-
 drivers/acpi/acpica/exmisc.c                       |   2 +-
 drivers/acpi/acpica/exmutex.c                      |   2 +-
 drivers/acpi/acpica/exnames.c                      |   2 +-
 drivers/acpi/acpica/exoparg1.c                     |   2 +-
 drivers/acpi/acpica/exoparg2.c                     |  10 +-
 drivers/acpi/acpica/exoparg3.c                     |   2 +-
 drivers/acpi/acpica/exoparg6.c                     |   2 +-
 drivers/acpi/acpica/exprep.c                       |   2 +-
 drivers/acpi/acpica/exregion.c                     |   2 +-
 drivers/acpi/acpica/exresnte.c                     |   2 +-
 drivers/acpi/acpica/exresolv.c                     |   2 +-
 drivers/acpi/acpica/exresop.c                      |   2 +-
 drivers/acpi/acpica/exserial.c                     |   2 +-
 drivers/acpi/acpica/exstore.c                      |   2 +-
 drivers/acpi/acpica/exstoren.c                     |   2 +-
 drivers/acpi/acpica/exstorob.c                     |   2 +-
 drivers/acpi/acpica/exsystem.c                     |   2 +-
 drivers/acpi/acpica/extrace.c                      |   2 +-
 drivers/acpi/acpica/exutils.c                      |   2 +-
 drivers/acpi/acpica/hwacpi.c                       |   2 +-
 drivers/acpi/acpica/hwesleep.c                     |   2 +-
 drivers/acpi/acpica/hwgpe.c                        |   2 +-
 drivers/acpi/acpica/hwsleep.c                      |   2 +-
 drivers/acpi/acpica/hwtimer.c                      |   2 +-
 drivers/acpi/acpica/hwvalid.c                      |   2 +-
 drivers/acpi/acpica/hwxface.c                      |   2 +-
 drivers/acpi/acpica/hwxfsleep.c                    |   2 +-
 drivers/acpi/acpica/nsarguments.c                  |   2 +-
 drivers/acpi/acpica/nsconvert.c                    |   2 +-
 drivers/acpi/acpica/nsdump.c                       |   2 +-
 drivers/acpi/acpica/nsdumpdv.c                     |   2 +-
 drivers/acpi/acpica/nsinit.c                       |   2 +-
 drivers/acpi/acpica/nsload.c                       |   2 +-
 drivers/acpi/acpica/nsparse.c                      |   2 +-
 drivers/acpi/acpica/nspredef.c                     |   2 +-
 drivers/acpi/acpica/nsprepkg.c                     |   2 +-
 drivers/acpi/acpica/nsrepair.c                     |   2 +-
 drivers/acpi/acpica/nsrepair2.c                    |   2 +-
 drivers/acpi/acpica/nsutils.c                      |   2 +-
 drivers/acpi/acpica/nswalk.c                       |   2 +-
 drivers/acpi/acpica/nsxfname.c                     |   2 +-
 drivers/acpi/acpica/psargs.c                       |   2 +-
 drivers/acpi/acpica/psloop.c                       |   2 +-
 drivers/acpi/acpica/psobject.c                     |   2 +-
 drivers/acpi/acpica/psopcode.c                     |   2 +-
 drivers/acpi/acpica/psopinfo.c                     |   2 +-
 drivers/acpi/acpica/psparse.c                      |   2 +-
 drivers/acpi/acpica/psscope.c                      |   2 +-
 drivers/acpi/acpica/pstree.c                       |   2 +-
 drivers/acpi/acpica/psutils.c                      |   2 +-
 drivers/acpi/acpica/pswalk.c                       |   2 +-
 drivers/acpi/acpica/psxface.c                      |   2 +-
 drivers/acpi/acpica/tbdata.c                       |   2 +-
 drivers/acpi/acpica/tbfadt.c                       |   2 +-
 drivers/acpi/acpica/tbfind.c                       |   2 +-
 drivers/acpi/acpica/tbinstal.c                     |   2 +-
 drivers/acpi/acpica/tbprint.c                      |   2 +-
 drivers/acpi/acpica/tbutils.c                      |   2 +-
 drivers/acpi/acpica/tbxface.c                      |   2 +-
 drivers/acpi/acpica/tbxfload.c                     |   2 +-
 drivers/acpi/acpica/tbxfroot.c                     |   2 +-
 drivers/acpi/acpica/utaddress.c                    |   2 +-
 drivers/acpi/acpica/utalloc.c                      |   2 +-
 drivers/acpi/acpica/utascii.c                      |   2 +-
 drivers/acpi/acpica/utbuffer.c                     |   2 +-
 drivers/acpi/acpica/utcache.c                      |   2 +-
 drivers/acpi/acpica/utcopy.c                       |   2 +-
 drivers/acpi/acpica/utdebug.c                      |   2 +-
 drivers/acpi/acpica/utdecode.c                     |  12 +-
 drivers/acpi/acpica/uteval.c                       |   2 +-
 drivers/acpi/acpica/utglobal.c                     |   2 +-
 drivers/acpi/acpica/uthex.c                        |   2 +-
 drivers/acpi/acpica/utids.c                        |   2 +-
 drivers/acpi/acpica/utinit.c                       |   2 +-
 drivers/acpi/acpica/utlock.c                       |   2 +-
 drivers/acpi/acpica/utobject.c                     |   2 +-
 drivers/acpi/acpica/utosi.c                        |   2 +-
 drivers/acpi/acpica/utpredef.c                     |   2 +-
 drivers/acpi/acpica/utprint.c                      |   2 +-
 drivers/acpi/acpica/uttrack.c                      |  14 +-
 drivers/acpi/acpica/utuuid.c                       |   2 +-
 drivers/acpi/acpica/utxface.c                      |   2 +-
 drivers/acpi/acpica/utxferror.c                    |  44 ++
 drivers/acpi/acpica/utxfinit.c                     |   2 +-
 drivers/acpi/apei/einj.c                           |  17 +-
 drivers/acpi/apei/erst.c                           |  27 +-
 drivers/acpi/apei/hest.c                           |   6 +
 drivers/acpi/bus.c                                 |  24 +-
 drivers/acpi/internal.h                            |   4 +
 drivers/acpi/tables.c                              |  12 +-
 drivers/ata/Kconfig                                |   2 +-
 drivers/base/power/clock_ops.c                     |  13 +-
 drivers/base/power/runtime.c                       |  45 ++-
 drivers/base/power/sysfs.c                         |  11 +-
 drivers/cpufreq/cpufreq.c                          |   2 -
 drivers/cpufreq/e_powersaver.c                     |   5 +-
 drivers/cpuidle/Kconfig                            |  11 +-
 drivers/cpuidle/governors/Makefile                 |   1 +
 drivers/cpuidle/governors/teo.c                    | 444 +++++++++++++++++++++
 drivers/gpu/drm/i915/i915_pmu.c                    |  16 +-
 drivers/gpu/drm/i915/i915_pmu.h                    |   4 +-
 drivers/gpu/vga/Kconfig                            |   1 +
 drivers/platform/x86/Kconfig                       |   6 +-
 drivers/thermal/intel/int340x_thermal/Kconfig      |   2 +-
 include/acpi/acbuffer.h                            |   2 +-
 include/acpi/acconfig.h                            |   2 +-
 include/acpi/acexcep.h                             |   2 +-
 include/acpi/acnames.h                             |   2 +-
 include/acpi/acoutput.h                            |   4 +-
 include/acpi/acpi.h                                |   2 +-
 include/acpi/acpiosxf.h                            |   2 +-
 include/acpi/acpixf.h                              |  10 +-
 include/acpi/acrestyp.h                            |   2 +-
 include/acpi/actbl.h                               |   2 +-
 include/acpi/actbl1.h                              |   2 +-
 include/acpi/actbl2.h                              |   2 +-
 include/acpi/actbl3.h                              |   2 +-
 include/acpi/actypes.h                             |   2 +-
 include/acpi/acuuid.h                              |   2 +-
 include/acpi/platform/acenv.h                      |   2 +-
 include/acpi/platform/acenvex.h                    |   2 +-
 include/acpi/platform/acgcc.h                      |   2 +-
 include/acpi/platform/acgccex.h                    |   2 +-
 include/acpi/platform/acintel.h                    |   2 +-
 include/acpi/platform/aclinux.h                    |   2 +-
 include/acpi/platform/aclinuxex.h                  |   2 +-
 include/linux/cpuidle.h                            |   8 +-
 include/linux/initrd.h                             |   3 +
 include/linux/pm.h                                 |   6 +-
 include/linux/pm_runtime.h                         |   2 +
 tools/power/acpi/common/cmfsize.c                  |   2 +-
 tools/power/acpi/common/getopt.c                   |   2 +-
 .../acpi/os_specific/service_layers/oslinuxtbl.c   |   2 +-
 .../acpi/os_specific/service_layers/osunixdir.c    |   2 +-
 .../acpi/os_specific/service_layers/osunixmap.c    |   2 +-
 .../acpi/os_specific/service_layers/osunixxf.c     |   2 +-
 tools/power/acpi/tools/acpidump/acpidump.h         |   2 +-
 tools/power/acpi/tools/acpidump/apdump.c           |   2 +-
 tools/power/acpi/tools/acpidump/apfiles.c          |   2 +-
 tools/power/acpi/tools/acpidump/apmain.c           |   2 +-
 209 files changed, 1239 insertions(+), 361 deletions(-)
 delete mode 100644 Documentation/cpuidle/driver.txt
 delete mode 100644 Documentation/cpuidle/governor.txt
 create mode 100644 Documentation/driver-api/pm/cpuidle.rst
 create mode 100644 drivers/cpuidle/governors/teo.c
Merging cpufreq-arm/cpufreq/arm/linux-next (d4990efa8c5f cpufreq: qcom-hw: Move to device_initcall)
$ git merge cpufreq-arm/cpufreq/arm/linux-next
Merge made by the 'recursive' strategy.
 drivers/cpufreq/qcom-cpufreq-hw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging cpupower/cpupower (bfeffd155283 Linux 5.0-rc1)
$ git merge cpupower/cpupower
Already up to date.
Merging opp/opp/linux-next (ade0c9493e97 Merge branch 'opp/genpd/propagation' into opp/linux-next)
$ git merge opp/opp/linux-next
Already up to date.
Merging thermal/next (24ef9ec891c7 thermal/intel: fixup for Kconfig string parsing tightening up)
$ git merge thermal/next
Already up to date.
Merging thermal-soc/next (9d216211fded thermal: generic-adc: Fix adc to temp interpolation)
$ git merge thermal-soc/next
Already up to date.
Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency)
$ git merge ieee1394/for-next
Already up to date.
Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning)
$ git merge dlm/next
Already up to date.
Merging swiotlb/linux-next (227a76b64718 swiotlb: clear io_tlb_start and io_tlb_end in swiotlb_exit)
$ git merge swiotlb/linux-next
Already up to date.
Merging rdma/for-next (5fc01fb846bc RDMA/cma: Rollback source IP address if failing to acquire device)
$ git merge rdma/for-next
Auto-merging drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
Auto-merging drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
Auto-merging drivers/infiniband/hw/qedr/verbs.c
Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
Auto-merging drivers/infiniband/hw/mthca/mthca_provider.c
Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
Auto-merging drivers/infiniband/hw/cxgb4/qp.c
Auto-merging drivers/infiniband/hw/bnxt_re/qplib_rcfw.c
Auto-merging drivers/infiniband/core/uverbs_main.c
Auto-merging drivers/infiniband/core/uverbs_cmd.c
Auto-merging drivers/infiniband/core/cma.c
Merge made by the 'recursive' strategy.
 drivers/infiniband/Kconfig                      | 15 +++---
 drivers/infiniband/core/Makefile                |  4 +-
 drivers/infiniband/core/cm.c                    |  3 +-
 drivers/infiniband/core/cma.c                   | 13 ++++-
 drivers/infiniband/core/core_priv.h             |  4 +-
 drivers/infiniband/core/device.c                |  9 ++--
 drivers/infiniband/core/sa_query.c              |  4 +-
 drivers/infiniband/core/sysfs.c                 | 28 +++++-----
 drivers/infiniband/core/umem.c                  |  9 +++-
 drivers/infiniband/core/uverbs_cmd.c            |  5 --
 drivers/infiniband/core/uverbs_main.c           | 24 +++++++++
 drivers/infiniband/hw/bnxt_re/ib_verbs.c        | 13 ++---
 drivers/infiniband/hw/bnxt_re/main.c            |  8 +--
 drivers/infiniband/hw/bnxt_re/qplib_rcfw.c      |  3 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.c     | 18 ++++---
 drivers/infiniband/hw/cxgb4/mem.c               |  2 +-
 drivers/infiniband/hw/cxgb4/provider.c          | 16 +++---
 drivers/infiniband/hw/cxgb4/qp.c                | 19 ++++---
 drivers/infiniband/hw/hfi1/sysfs.c              | 16 +++---
 drivers/infiniband/hw/hfi1/verbs.c              |  2 +-
 drivers/infiniband/hw/hns/Kconfig               |  1 -
 drivers/infiniband/hw/hns/hns_roce_cq.c         |  9 ++--
 drivers/infiniband/hw/hns/hns_roce_db.c         |  6 +--
 drivers/infiniband/hw/hns/hns_roce_device.h     |  3 +-
 drivers/infiniband/hw/hns/hns_roce_hw_v2.c      | 26 +++++++---
 drivers/infiniband/hw/hns/hns_roce_main.c       |  4 +-
 drivers/infiniband/hw/hns/hns_roce_mr.c         |  7 ++-
 drivers/infiniband/hw/hns/hns_roce_pd.c         |  2 +-
 drivers/infiniband/hw/hns/hns_roce_qp.c         | 16 +++---
 drivers/infiniband/hw/hns/hns_roce_srq.c        |  7 ++-
 drivers/infiniband/hw/i40iw/i40iw_verbs.c       |  9 ++--
 drivers/infiniband/hw/mlx4/Kconfig              |  1 -
 drivers/infiniband/hw/mlx4/cq.c                 | 19 ++++---
 drivers/infiniband/hw/mlx4/doorbell.c           |  6 +--
 drivers/infiniband/hw/mlx4/main.c               |  9 ++--
 drivers/infiniband/hw/mlx4/mlx4_ib.h            |  3 +-
 drivers/infiniband/hw/mlx4/mr.c                 | 11 ++--
 drivers/infiniband/hw/mlx4/qp.c                 | 14 +++--
 drivers/infiniband/hw/mlx4/srq.c                |  5 +-
 drivers/infiniband/hw/mlx5/Kconfig              |  1 -
 drivers/infiniband/hw/mlx5/cq.c                 | 11 ++--
 drivers/infiniband/hw/mlx5/devx.c               |  2 +-
 drivers/infiniband/hw/mlx5/doorbell.c           |  6 +--
 drivers/infiniband/hw/mlx5/main.c               | 68 +++++++++++++------------
 drivers/infiniband/hw/mlx5/mem.c                |  5 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h            | 16 ++++--
 drivers/infiniband/hw/mlx5/mr.c                 | 63 ++++++++++-------------
 drivers/infiniband/hw/mlx5/odp.c                | 10 ++--
 drivers/infiniband/hw/mlx5/qp.c                 | 40 +++++++--------
 drivers/infiniband/hw/mlx5/srq.c                |  5 +-
 drivers/infiniband/hw/mthca/mthca_provider.c    | 19 ++++---
 drivers/infiniband/hw/nes/Kconfig               |  2 +-
 drivers/infiniband/hw/nes/nes_verbs.c           |  6 +--
 drivers/infiniband/hw/ocrdma/ocrdma_main.c      |  8 +--
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c     |  4 +-
 drivers/infiniband/hw/qedr/main.c               |  5 +-
 drivers/infiniband/hw/qedr/verbs.c              | 35 +++++++------
 drivers/infiniband/hw/qib/qib_sysfs.c           | 18 +++----
 drivers/infiniband/hw/qib/qib_verbs.c           |  2 +-
 drivers/infiniband/hw/usnic/usnic_ib_main.c     |  2 +-
 drivers/infiniband/hw/usnic/usnic_ib_sysfs.c    | 26 ++++------
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c    |  4 +-
 drivers/infiniband/hw/usnic/usnic_uiom.c        |  5 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c    |  2 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c  |  2 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c    |  3 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c    |  6 +--
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c   |  4 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c |  4 +-
 drivers/infiniband/sw/rdmavt/mr.c               |  3 +-
 drivers/infiniband/sw/rdmavt/pd.c               |  2 +-
 drivers/infiniband/sw/rdmavt/vt.c               |  7 ++-
 drivers/infiniband/sw/rxe/rxe_mr.c              |  2 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c           |  6 +--
 drivers/infiniband/ulp/srp/ib_srp.c             |  3 +-
 include/linux/mlx5/driver.h                     |  4 --
 include/rdma/ib_umem.h                          |  8 +--
 include/rdma/ib_umem_odp.h                      | 26 +++++-----
 include/rdma/ib_verbs.h                         | 36 +++++++++++--
 include/rdma/rdma_vt.h                          |  3 --
 80 files changed, 452 insertions(+), 405 deletions(-)
Merging net-next/master (22c2ad616b74 net: add a route cache full diagnostic message)
$ git merge net-next/master
Auto-merging include/linux/phy.h
Auto-merging drivers/net/phy/phy_device.c
Auto-merging drivers/net/phy/phy.c
Auto-merging drivers/net/phy/micrel.c
Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
Auto-merging MAINTAINERS
Auto-merging Documentation/networking/snmp_counter.rst
CONFLICT (content): Merge conflict in Documentation/networking/snmp_counter.rst
Resolved 'Documentation/networking/snmp_counter.rst' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ed57ffd4472b] Merge remote-tracking branch 'net-next/master'
$ git diff -M --stat --summary HEAD^..
 Documentation/devicetree/bindings/net/dsa/ksz.txt  | 102 ++--
 Documentation/networking/dsa/dsa.txt               |  13 -
 Documentation/networking/snmp_counter.rst          | 123 +++-
 Documentation/networking/switchdev.txt             |   2 +-
 MAINTAINERS                                        |   1 +
 arch/alpha/include/uapi/asm/socket.h               |   2 +
 arch/arm/mach-orion5x/common.c                     |   2 +-
 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c       |   2 +-
 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c        |   2 +-
 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c       |   2 +-
 arch/arm/mach-orion5x/wnr854t-setup.c              |   2 +-
 arch/arm/mach-orion5x/wrt350n-v2-setup.c           |   2 +-
 arch/arm/plat-orion/common.c                       |   2 +-
 arch/ia64/include/uapi/asm/socket.h                |   2 +
 arch/mips/include/uapi/asm/socket.h                |   2 +
 arch/parisc/include/uapi/asm/socket.h              |   2 +
 arch/s390/include/uapi/asm/socket.h                |   2 +
 arch/sparc/include/uapi/asm/socket.h               |   2 +
 arch/xtensa/include/uapi/asm/socket.h              |   2 +
 drivers/net/dsa/lantiq_gswip.c                     |  24 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h   |   2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   | 176 +++---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c   |   2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c     |  12 +-
 drivers/net/ethernet/chelsio/cxgb4/l2t.c           |   2 +-
 drivers/net/ethernet/davicom/dm9000.c              |   1 +
 drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c   |  68 +--
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  |   5 +-
 drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c   |  13 +
 drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h   |   3 +
 drivers/net/ethernet/huawei/hinic/hinic_hw_if.c    |  28 +
 drivers/net/ethernet/huawei/hinic/hinic_hw_if.h    |  14 +
 drivers/net/ethernet/huawei/hinic/hinic_rx.c       |  11 +-
 drivers/net/ethernet/huawei/hinic/hinic_tx.c       |   8 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |   3 +-
 drivers/net/ethernet/intel/ice/ice.h               |  16 +
 drivers/net/ethernet/intel/ice/ice_adminq_cmd.h    |  77 ++-
 drivers/net/ethernet/intel/ice/ice_common.c        | 160 ++++-
 drivers/net/ethernet/intel/ice/ice_common.h        |  11 +-
 drivers/net/ethernet/intel/ice/ice_ethtool.c       | 680 ++++++++++++++++++++-
 drivers/net/ethernet/intel/ice/ice_hw_autogen.h    |   1 +
 drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h     |   3 +
 drivers/net/ethernet/intel/ice/ice_lib.c           | 266 ++++----
 drivers/net/ethernet/intel/ice/ice_lib.h           |   5 +-
 drivers/net/ethernet/intel/ice/ice_main.c          | 135 +++-
 drivers/net/ethernet/intel/ice/ice_nvm.c           |  81 +++
 drivers/net/ethernet/intel/ice/ice_sched.c         | 156 ++---
 drivers/net/ethernet/intel/ice/ice_sched.h         |   2 +
 drivers/net/ethernet/intel/ice/ice_sriov.c         |   9 +
 drivers/net/ethernet/intel/ice/ice_txrx.c          |  71 ++-
 drivers/net/ethernet/intel/ice/ice_txrx.h          |  32 +-
 drivers/net/ethernet/intel/ice/ice_type.h          |   4 +-
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c   |  24 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |   3 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   3 +-
 .../mellanox/mlxsw/spectrum_acl_bloom_filter.c     |   4 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c |  10 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h |   3 +-
 .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c   |   6 +-
 .../net/ethernet/mellanox/mlxsw/spectrum_router.c  |   6 +-
 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  37 +-
 drivers/net/ethernet/mscc/ocelot.c                 |   3 +-
 drivers/net/ethernet/netronome/nfp/flower/cmsg.c   |   2 +-
 drivers/net/ethernet/netronome/nfp/flower/cmsg.h   |   3 +
 drivers/net/ethernet/netronome/nfp/flower/main.c   | 109 +++-
 drivers/net/ethernet/netronome/nfp/flower/main.h   |  89 ++-
 drivers/net/ethernet/netronome/nfp/flower/match.c  |   3 -
 .../net/ethernet/netronome/nfp/flower/metadata.c   |  27 +-
 .../ethernet/netronome/nfp/flower/tunnel_conf.c    | 612 ++++++++++++-------
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c   |   3 +-
 drivers/net/ethernet/realtek/atp.c                 |  27 +-
 drivers/net/ethernet/rocker/rocker_main.c          |   2 +-
 drivers/net/ethernet/rocker/rocker_ofdpa.c         |   4 +-
 drivers/net/ethernet/sfc/ef10.c                    |  14 +-
 drivers/net/ethernet/sfc/mcdi.c                    |  56 +-
 drivers/net/ethernet/sfc/mtd.c                     |   3 +
 drivers/net/ethernet/sun/sungem.c                  |   2 +-
 drivers/net/macvlan.c                              |   3 +-
 drivers/net/phy/mdio_bus.c                         |   2 -
 drivers/net/phy/micrel.c                           |  43 +-
 drivers/net/phy/phy.c                              |   7 +-
 drivers/net/phy/phy_device.c                       |  83 ++-
 drivers/net/vxlan.c                                | 352 ++++++-----
 drivers/net/wan/dscc4.c                            |  50 +-
 include/linux/netdevice.h                          |   6 +-
 include/linux/phy.h                                |   3 +
 include/linux/platform_data/b53.h                  |   2 +-
 include/linux/platform_data/dsa.h                  |  68 +++
 include/linux/platform_data/mv88e6xxx.h            |   2 +-
 include/net/dsa.h                                  |  66 +-
 include/net/switchdev.h                            |   6 +-
 include/net/tls.h                                  |   3 +-
 include/net/vxlan.h                                |   6 +-
 include/uapi/asm-generic/socket.h                  |   2 +
 net/bridge/br_fdb.c                                |   3 +-
 net/bridge/br_private.h                            |   3 +-
 net/bridge/br_switchdev.c                          |   2 +-
 net/core/dst.c                                     |   6 +-
 net/core/rtnetlink.c                               |   5 +-
 net/core/skmsg.c                                   |  25 +-
 net/core/sock.c                                    |  46 +-
 net/decnet/dn_fib.c                                |   2 +-
 net/dsa/dsa_priv.h                                 |   3 +-
 net/dsa/master.c                                   |  56 +-
 net/dsa/slave.c                                    |   5 +-
 net/ipv4/tcp_output.c                              |  47 +-
 net/ipv4/tcp_timer.c                               |  83 ++-
 net/ipv4/udp_tunnel.c                              |  15 +-
 net/ipv6/ip6_udp_tunnel.c                          |  15 +-
 net/openvswitch/meter.c                            |   3 +-
 net/switchdev/switchdev.c                          |   5 +-
 net/tls/tls_sw.c                                   | 280 ++++++---
 net/vmw_vsock/af_vsock.c                           |   2 +-
 .../selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh  | 126 ++++
 tools/testing/selftests/net/tls.c                  |  12 +-
 115 files changed, 3472 insertions(+), 1381 deletions(-)
 create mode 100644 include/linux/platform_data/dsa.h
 create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_fdb_veto.sh
Merging bpf-next/master (d0b2818efbe2 bpf: fix a (false) compiler warning)
$ git merge bpf-next/master
Auto-merging kernel/bpf/btf.c
Merge made by the 'recursive' strategy.
 kernel/bpf/btf.c                                | 104 +++++++--
 kernel/bpf/verifier.c                           |   3 +-
 tools/bpf/bpftool/Documentation/bpftool-map.rst |  28 ++-
 tools/bpf/bpftool/bash-completion/bpftool       |  91 ++++++--
 tools/bpf/bpftool/btf_dumper.c                  |  98 +++++++-
 tools/bpf/bpftool/map.c                         | 225 +++++++++++++------
 tools/lib/bpf/Makefile                          |  17 +-
 tools/testing/selftests/bpf/test_btf.c          | 284 +++++++++++++++++++++---
 8 files changed, 675 insertions(+), 175 deletions(-)
Merging ipsec-next/master (590ce401c207 dt-bindings: net: dsa: ksz9477: fix indentation for switch spi bindings)
$ git merge ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (73f5a82bb3c9 RDMA/mad: Reduce MAD scope to mlx5_ib only)
$ git merge mlx5-next/mlx5-next
Auto-merging include/linux/mlx5/driver.h
Removing drivers/net/ethernet/mellanox/mlx5/core/mad.c
Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
Merge made by the 'recursive' strategy.
 drivers/infiniband/hw/mlx5/cmd.c                 | 37 ++++++++++++
 drivers/infiniband/hw/mlx5/cmd.h                 |  2 +
 drivers/infiniband/hw/mlx5/mad.c                 | 11 ++--
 drivers/infiniband/hw/mlx5/mlx5_ib.h             |  3 -
 drivers/net/ethernet/mellanox/mlx5/core/Makefile |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/mad.c    | 75 ------------------------
 include/linux/mlx5/driver.h                      |  2 -
 7 files changed, 47 insertions(+), 85 deletions(-)
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/mad.c
Merging netfilter-next/master (9dde6da51297 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue)
$ git merge netfilter-next/master
Already up to date.
Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
$ git merge nfc-next/master
Auto-merging drivers/nfc/fdp/i2c.c
Merge made by the 'recursive' strategy.
 drivers/nfc/fdp/fdp.c      | 35 +++++------------------------------
 drivers/nfc/fdp/i2c.c      | 26 +++++++++++++-------------
 drivers/nfc/st21nfca/dep.c |  3 ++-
 drivers/nfc/st21nfca/se.c  |  5 +++--
 drivers/nfc/st95hf/core.c  |  7 ++-----
 net/nfc/netlink.c          |  6 ++++--
 6 files changed, 29 insertions(+), 53 deletions(-)
Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
$ git merge ipvs-next/master
Already up to date.
Merging wireless-drivers-next/master (4ad0be160544 brcmfmac: Use firmware_request_nowarn for the clm_blob)
$ git merge wireless-drivers-next/master
Merge made by the 'recursive' strategy.
 drivers/bcma/bcma_private.h                        |   9 +-
 drivers/bcma/driver_gpio.c                         |   2 +-
 drivers/bcma/host_pci.c                            |   2 +
 drivers/bcma/host_soc.c                            |   4 +-
 drivers/bcma/main.c                                |  45 ++-----
 .../wireless/broadcom/brcm80211/brcmfmac/common.c  |   2 +-
 .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c |  15 +++
 .../net/wireless/broadcom/brcm80211/brcmfmac/pno.c |   5 +
 .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c |   6 +-
 .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c      |  13 +-
 drivers/net/wireless/ray_cs.c                      |   2 +-
 drivers/net/wireless/rsi/rsi_91x_hal.c             |   3 +
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  67 +++++++++++
 drivers/net/wireless/rsi/rsi_91x_main.c            |   1 +
 drivers/net/wireless/rsi/rsi_91x_mgmt.c            | 133 +++++++++++++++++++++
 drivers/net/wireless/rsi/rsi_main.h                |  22 ++++
 drivers/net/wireless/rsi/rsi_mgmt.h                |  35 ++++++
 drivers/net/wireless/st/cw1200/queue.c             |   1 -
 drivers/net/wireless/st/cw1200/scan.c              |   5 +-
 drivers/net/wireless/ti/wlcore/main.c              |   7 +-
 include/linux/bcma/bcma.h                          |  11 +-
 21 files changed, 321 insertions(+), 69 deletions(-)
Merging bluetooth/master (44543f1dd2a3 Documentation: networking: dsa: Update documentation)
$ git merge bluetooth/master
Already up to date.
Merging mac80211-next/master (44a7b3b6e3a4 Merge branch 'bnxt_en-next')
$ git merge mac80211-next/master
Already up to date.
Merging gfs2/for-next (8e143b90e4d4 Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
$ git merge gfs2/for-next
Already up to date.
Merging mtd/mtd/next (2431c4f5b46c mtd: Implement mtd_{read,write}() as wrappers around mtd_{read,write}_oob())
$ git merge mtd/mtd/next
Auto-merging drivers/mtd/mtdcore.c
Merge made by the 'recursive' strategy.
 drivers/mtd/chips/cfi_cmdset_0001.c |  3 +-
 drivers/mtd/chips/gen_probe.c       |  2 +-
 drivers/mtd/devices/mtdram.c        |  2 -
 drivers/mtd/lpddr/qinfo_probe.c     |  4 +-
 drivers/mtd/mtdcore.c               | 75 ++++++++++++-------------------------
 5 files changed, 29 insertions(+), 57 deletions(-)
Merging nand/nand/next (9f952302802f mtd: rawnand: Simplify the locking)
$ git merge nand/nand/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/stm32-fmc2-nand.txt    |   61 +
 drivers/mtd/nand/raw/Kconfig                       |    9 +
 drivers/mtd/nand/raw/Makefile                      |    1 +
 drivers/mtd/nand/raw/denali_dt.c                   |   27 +-
 drivers/mtd/nand/raw/marvell_nand.c                |    5 +-
 drivers/mtd/nand/raw/mtk_nand.c                    |    3 +-
 drivers/mtd/nand/raw/nand_base.c                   |  111 +-
 drivers/mtd/nand/raw/omap2.c                       |   20 +-
 drivers/mtd/nand/raw/r852.c                        |    3 +-
 drivers/mtd/nand/raw/stm32_fmc2_nand.c             | 2073 ++++++++++++++++++++
 drivers/mtd/nand/raw/sunxi_nand.c                  |  732 +++----
 drivers/mtd/nand/raw/tmio_nand.c                   |   21 +-
 drivers/mtd/nand/spi/core.c                        |  231 ++-
 drivers/mtd/nand/spi/macronix.c                    |    8 +-
 include/linux/mtd/rawnand.h                        |   24 +-
 include/linux/mtd/spinand.h                        |    7 +
 16 files changed, 2759 insertions(+), 577 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/stm32-fmc2-nand.txt
 create mode 100644 drivers/mtd/nand/raw/stm32_fmc2_nand.c
Merging spi-nor/spi-nor/next (6f79a594afda MAINTAINERS: add myself as SPI NOR co-maintainer)
$ git merge spi-nor/spi-nor/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
Merging crypto/master (6b476662b09c crypto: algapi - reject NULL crypto_spawn::inst)
$ git merge crypto/master
Auto-merging drivers/crypto/amcc/crypto4xx_core.c
Merge made by the 'recursive' strategy.
 crypto/Kconfig                             |   4 +-
 crypto/algapi.c                            |  36 +----
 crypto/arc4.c                              |  82 ++++++------
 crypto/cbc.c                               | 131 ++-----------------
 crypto/cfb.c                               | 139 +++-----------------
 crypto/crypto_null.c                       |  57 ++++----
 crypto/ctr.c                               | 160 ++++++-----------------
 crypto/ecb.c                               | 151 +++++----------------
 crypto/keywrap.c                           | 198 ++++++++++------------------
 crypto/ofb.c                               | 202 ++++++-----------------------
 crypto/pcbc.c                              | 143 +++-----------------
 crypto/skcipher.c                          | 131 +++++++++++++++++++
 crypto/testmgr.h                           |  53 +++++++-
 drivers/crypto/amcc/crypto4xx_core.c       |  87 +++++++++++++
 drivers/crypto/amcc/crypto4xx_core.h       |   4 +
 drivers/crypto/amcc/crypto4xx_reg_def.h    |   1 +
 drivers/crypto/caam/caamalg_qi2.c          |   7 -
 drivers/crypto/caam/caamhash.c             | 199 +++++++++++++++++++++++++---
 drivers/crypto/caam/caamhash_desc.c        |  58 ++++++++-
 drivers/crypto/caam/caamhash_desc.h        |   2 +
 drivers/crypto/caam/ctrl.c                 |   4 -
 drivers/crypto/caam/error.c                |   6 +
 drivers/crypto/ccp/ccp-crypto-aes-cmac.c   |   2 +-
 drivers/crypto/ccp/ccp-crypto-sha.c        |   2 +-
 drivers/crypto/ccp/ccp-ops.c               |   2 +-
 drivers/crypto/ccp/psp-dev.c               |   2 +-
 drivers/crypto/ccp/psp-dev.h               |   2 +-
 drivers/crypto/ccp/sp-dev.c                |   2 +-
 drivers/crypto/ccp/sp-dev.h                |   2 +-
 drivers/crypto/ccp/sp-pci.c                |   2 +-
 drivers/crypto/ccp/sp-platform.c           |   2 +-
 drivers/crypto/chelsio/chcr_algo.c         |   8 +-
 drivers/crypto/chelsio/chtls/chtls_io.c    |  12 +-
 drivers/crypto/ux500/cryp/cryp_core.c      |   6 +
 drivers/crypto/virtio/virtio_crypto_algs.c |   2 +-
 include/crypto/algapi.h                    |   6 +-
 include/crypto/internal/hash.h             |   6 +-
 include/crypto/internal/skcipher.h         |  15 +++
 include/linux/crypto.h                     |   8 --
 39 files changed, 872 insertions(+), 1064 deletions(-)
Merging drm/drm-next (b122153c7198 Merge tag 'du-next-20190114' of git://linuxtv.org/pinchartl/media into drm-next)
$ git merge drm/drm-next
Auto-merging include/drm/drm_dp_mst_helper.h
Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h
Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
Auto-merging drivers/gpu/drm/drm_mode_object.c
Auto-merging drivers/gpu/drm/bridge/tc358767.c
Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/display/bridge/renesas,lvds.txt       |   3 +-
 .../devicetree/bindings/display/renesas,du.txt     |   2 +
 Documentation/gpu/todo.rst                         |   3 -
 MAINTAINERS                                        |   2 +-
 drivers/dma-buf/dma-buf.c                          |  12 +-
 drivers/dma-buf/dma-fence.c                        |   2 +-
 drivers/dma-buf/sw_sync.c                          |   2 +-
 drivers/dma-buf/sync_debug.c                       |  16 +-
 drivers/dma-buf/sync_file.c                        |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c             |   2 +-
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c  |   3 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |   9 -
 drivers/gpu/drm/ast/ast_fb.c                       |   2 -
 drivers/gpu/drm/ati_pcigart.c                      |   7 +-
 drivers/gpu/drm/bochs/bochs_hw.c                   |   7 +
 drivers/gpu/drm/bridge/adv7511/adv7511.h           |   4 +-
 drivers/gpu/drm/bridge/adv7511/adv7511_drv.c       |   8 +-
 drivers/gpu/drm/bridge/adv7511/adv7533.c           |   2 +-
 drivers/gpu/drm/bridge/analogix-anx78xx.c          |   4 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |   4 +-
 drivers/gpu/drm/bridge/sii902x.c                   |   4 +-
 .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c    |   5 +-
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |   4 +-
 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c      |  18 +-
 drivers/gpu/drm/bridge/tc358767.c                  |   9 +-
 drivers/gpu/drm/drm_atomic.c                       |  19 +-
 drivers/gpu/drm/drm_bridge.c                       |   4 +-
 drivers/gpu/drm/drm_bufs.c                         |  11 ++
 drivers/gpu/drm/drm_connector.c                    |  91 +++++++---
 drivers/gpu/drm/drm_context.c                      |  15 +-
 drivers/gpu/drm/drm_dp_mst_topology.c              | 109 +++++++-----
 drivers/gpu/drm/drm_drv.c                          |   1 -
 drivers/gpu/drm/drm_internal.h                     |   2 +
 drivers/gpu/drm/drm_lease.c                        |   6 +-
 drivers/gpu/drm/drm_mode_config.c                  |   5 +-
 drivers/gpu/drm/drm_mode_object.c                  |   9 +-
 drivers/gpu/drm/drm_modeset_lock.c                 |   8 +
 drivers/gpu/drm/drm_syncobj.c                      |  91 ++++------
 drivers/gpu/drm/etnaviv/etnaviv_gem.c              |   2 +-
 drivers/gpu/drm/exynos/exynos_drm_mic.c            |   4 +-
 drivers/gpu/drm/i2c/tda998x_drv.c                  |   6 +-
 drivers/gpu/drm/i915/i915_gem.c                    |   4 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |   8 +-
 drivers/gpu/drm/i915/i915_request.c                |  12 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |   2 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |  10 --
 drivers/gpu/drm/i915/intel_engine_cs.c             |   2 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |   6 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  14 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   4 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c           |   2 +-
 drivers/gpu/drm/msm/dsi/dsi.h                      |   2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c                 |   2 +-
 drivers/gpu/drm/msm/dsi/dsi_manager.c              |   4 +-
 drivers/gpu/drm/msm/edp/edp_bridge.c               |   4 +-
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |   4 +-
 drivers/gpu/drm/msm/msm_gem.c                      |   2 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c            |   8 -
 drivers/gpu/drm/qxl/qxl_display.c                  |   1 -
 drivers/gpu/drm/r128/r128_cce.c                    |   5 +-
 drivers/gpu/drm/radeon/radeon_dp_mst.c             |   9 -
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c             |  43 +++--
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h             |   8 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  42 +++--
 drivers/gpu/drm/rcar-du/rcar_du_drv.h              |   9 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c          |  11 --
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h          |   2 -
 drivers/gpu/drm/rcar-du/rcar_du_group.c            |  51 +++++-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c              |  23 ++-
 .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7790.dts    |  93 +++++-----
 .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7791.dts    |  53 +++---
 .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7793.dts    |  53 +++---
 .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts    |  53 +++---
 .../gpu/drm/rcar-du/rcar_du_of_lvds_r8a7796.dts    |  53 +++---
 drivers/gpu/drm/rcar-du/rcar_du_plane.c            |   1 -
 drivers/gpu/drm/rcar-du/rcar_du_plane.h            |   3 +-
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |   1 -
 drivers/gpu/drm/rcar-du/rcar_du_vsp.h              |   3 +-
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c             |  15 ++
 drivers/gpu/drm/rcar-du/rcar_lvds.c                |   5 +-
 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c    |   2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   2 +
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |   4 +-
 drivers/gpu/drm/sti/sti_dvo.c                      |   4 +-
 drivers/gpu/drm/sti/sti_hda.c                      |   4 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |   4 +-
 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c              |   2 +-
 drivers/gpu/drm/tegra/hub.c                        |   2 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |  34 ++--
 drivers/gpu/drm/v3d/v3d_drv.h                      |   1 -
 drivers/gpu/drm/v3d/v3d_gem.c                      |  60 ++-----
 drivers/gpu/drm/vc4/vc4_crtc.c                     |  43 +++++
 drivers/gpu/drm/vc4/vc4_drv.h                      |   3 +
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |  16 ++
 drivers/gpu/drm/vc4/vc4_kms.c                      |   3 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    | 128 ++++++++++++--
 drivers/gpu/drm/vgem/vgem_fence.c                  |   4 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   1 -
 drivers/gpu/drm/virtio/virtgpu_drv.c               |   9 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |  14 --
 drivers/gpu/drm/virtio/virtgpu_fb.c                | 191 ---------------------
 drivers/gpu/drm/virtio/virtgpu_kms.c               |   8 -
 drivers/gpu/drm/vkms/vkms_drv.c                    |   1 +
 drivers/gpu/drm/xen/xen_drm_front_conn.c           |   1 -
 include/drm/bridge/dw_mipi_dsi.h                   |   3 +-
 include/drm/drmP.h                                 |   2 -
 include/drm/drm_atomic.h                           |  37 +++-
 include/drm/drm_bridge.h                           |   8 +-
 include/drm/drm_connector.h                        |   4 +-
 include/drm/drm_dp_mst_helper.h                    |   2 -
 include/drm/drm_file.h                             |   1 +
 include/drm/drm_hdcp.h                             |   2 +
 include/drm/drm_legacy.h                           |  14 +-
 include/drm/drm_mode_config.h                      |  23 ++-
 include/drm/drm_syncobj.h                          |  23 +--
 include/drm/intel-gtt.h                            |   3 +
 include/linux/dma-fence.h                          |  22 ++-
 include/uapi/drm/v3d_drm.h                         |   8 +
 118 files changed, 941 insertions(+), 900 deletions(-)
Merging drm-intel/for-linux-next (1b4bd5c4a663 drm/i915: Limit the for_each_set_bit() to the valid range)
$ git merge drm-intel/for-linux-next
Auto-merging include/drm/drm_dp_helper.h
Auto-merging drivers/gpu/drm/i915/selftests/intel_hangcheck.c
Auto-merging drivers/gpu/drm/i915/intel_psr.c
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c
Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/i915_sysfs.c
Auto-merging drivers/gpu/drm/i915/i915_request.c
Auto-merging drivers/gpu/drm/i915/i915_pmu.c
Auto-merging drivers/gpu/drm/i915/i915_gpu_error.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
Auto-merging drivers/gpu/drm/i915/i915_gem_context.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
Auto-merging drivers/acpi/pmic/intel_pmic_xpower.c
Resolved 'drivers/gpu/drm/i915/i915_debugfs.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 79d79c32e6bb] Merge remote-tracking branch 'drm-intel/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 drivers/acpi/pmic/intel_pmic.c                     |   61 +
 drivers/acpi/pmic/intel_pmic.h                     |    4 +
 drivers/acpi/pmic/intel_pmic_chtwc.c               |   19 +
 drivers/acpi/pmic/intel_pmic_xpower.c              |    1 +
 drivers/gpu/drm/i915/Kconfig.debug                 |    3 +-
 drivers/gpu/drm/i915/Makefile                      |    5 +-
 drivers/gpu/drm/i915/dvo.h                         |    1 -
 drivers/gpu/drm/i915/gvt/aperture_gm.c             |    8 +-
 drivers/gpu/drm/i915/gvt/gvt.h                     |    2 +-
 drivers/gpu/drm/i915/gvt/sched_policy.c            |    2 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |    4 +-
 drivers/gpu/drm/i915/gvt/vgpu.c                    |    4 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c             |    2 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |  762 +++++------
 drivers/gpu/drm/i915/i915_drv.c                    |  265 +---
 drivers/gpu/drm/i915/i915_drv.h                    |  320 ++---
 drivers/gpu/drm/i915/i915_gem.c                    |  752 ++---------
 drivers/gpu/drm/i915/i915_gem_context.c            |    3 +-
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |    1 -
 drivers/gpu/drm/i915/i915_gem_evict.c              |    1 -
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   10 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c          |   25 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  194 +--
 drivers/gpu/drm/i915/i915_gem_gtt.h                |    4 +-
 drivers/gpu/drm/i915/i915_gem_internal.c           |    1 -
 drivers/gpu/drm/i915/i915_gem_object.h             |   10 +-
 drivers/gpu/drm/i915/i915_gem_shrinker.c           |  163 +--
 drivers/gpu/drm/i915/i915_gem_stolen.c             |    8 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |    5 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |  225 ++--
 drivers/gpu/drm/i915/i915_gpu_error.c              |   63 +-
 drivers/gpu/drm/i915/i915_gpu_error.h              |    5 +-
 drivers/gpu/drm/i915/i915_ioc32.c                  |    1 -
 drivers/gpu/drm/i915/i915_irq.c                    |  359 +----
 drivers/gpu/drm/i915/i915_params.c                 |   32 +-
 drivers/gpu/drm/i915/i915_params.h                 |   11 +
 drivers/gpu/drm/i915/i915_pci.c                    |    6 +-
 drivers/gpu/drm/i915/i915_perf.c                   |   20 +-
 drivers/gpu/drm/i915/i915_pmu.c                    |   23 +-
 drivers/gpu/drm/i915/i915_query.c                  |    2 +-
 drivers/gpu/drm/i915/i915_reg.h                    |  240 ++--
 drivers/gpu/drm/i915/i915_request.c                |  209 +--
 drivers/gpu/drm/i915/i915_request.h                |    1 -
 drivers/gpu/drm/i915/i915_reset.c                  | 1389 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_reset.h                  |   56 +
 drivers/gpu/drm/i915/i915_suspend.c                |   13 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |   27 +-
 drivers/gpu/drm/i915/i915_timeline.h               |    8 -
 drivers/gpu/drm/i915/i915_trace.h                  |   30 -
 drivers/gpu/drm/i915/icl_dsi.c                     |   44 +-
 drivers/gpu/drm/i915/intel_acpi.c                  |    1 -
 drivers/gpu/drm/i915/intel_atomic.c                |    7 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |    5 +-
 drivers/gpu/drm/i915/intel_audio.c                 |    6 +-
 drivers/gpu/drm/i915/intel_bios.c                  |   23 +-
 drivers/gpu/drm/i915/intel_breadcrumbs.c           |   26 -
 drivers/gpu/drm/i915/intel_cdclk.c                 |   60 +-
 drivers/gpu/drm/i915/intel_color.c                 |  218 ++-
 drivers/gpu/drm/i915/intel_connector.c             |    1 -
 drivers/gpu/drm/i915/intel_crt.c                   |   89 +-
 drivers/gpu/drm/i915/intel_csr.c                   |   25 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |  370 +++---
 drivers/gpu/drm/i915/intel_device_info.c           |  107 +-
 drivers/gpu/drm/i915/intel_device_info.h           |   31 +-
 drivers/gpu/drm/i915/intel_display.c               |  293 +++--
 drivers/gpu/drm/i915/intel_display.h               |    6 +-
 drivers/gpu/drm/i915/intel_dp.c                    |  614 +++++----
 drivers/gpu/drm/i915/intel_dp_link_training.c      |   32 +-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   15 +-
 drivers/gpu/drm/i915/intel_dpio_phy.c              |   18 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              |  205 +--
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |   53 +-
 drivers/gpu/drm/i915/intel_drv.h                   |  123 +-
 drivers/gpu/drm/i915/intel_dsi.h                   |    2 +-
 drivers/gpu/drm/i915/intel_dsi_vbt.c               |   24 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |   12 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |  168 +--
 drivers/gpu/drm/i915/intel_fbc.c                   |   33 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   10 +-
 drivers/gpu/drm/i915/intel_fifo_underrun.c         |   18 +-
 drivers/gpu/drm/i915/intel_frontbuffer.c           |    1 -
 drivers/gpu/drm/i915/intel_guc.h                   |    3 +
 drivers/gpu/drm/i915/intel_guc_fw.c                |    6 +-
 drivers/gpu/drm/i915/intel_guc_log.c               |   29 +-
 drivers/gpu/drm/i915/intel_guc_submission.c        |    3 +-
 drivers/gpu/drm/i915/intel_hangcheck.c             |  168 +--
 drivers/gpu/drm/i915/intel_hdcp.c                  |   21 +-
 drivers/gpu/drm/i915/intel_hdmi.c                  |   33 +-
 drivers/gpu/drm/i915/intel_hotplug.c               |    6 +-
 drivers/gpu/drm/i915/intel_huc.c                   |    8 +-
 drivers/gpu/drm/i915/intel_huc_fw.c                |    7 +-
 drivers/gpu/drm/i915/intel_i2c.c                   |   21 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  309 +++--
 drivers/gpu/drm/i915/intel_lrc.h                   |   10 +-
 drivers/gpu/drm/i915/intel_lspcon.c                |   20 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |   25 +-
 drivers/gpu/drm/i915/intel_mocs.c                  |    2 +-
 drivers/gpu/drm/i915/intel_mocs.h                  |    1 -
 drivers/gpu/drm/i915/intel_opregion.c              |    1 -
 drivers/gpu/drm/i915/intel_overlay.c               |   11 +-
 drivers/gpu/drm/i915/intel_panel.c                 |   27 +-
 drivers/gpu/drm/i915/intel_pipe_crc.c              |   32 +-
 drivers/gpu/drm/i915/intel_pm.c                    |  916 ++++++-------
 drivers/gpu/drm/i915/intel_psr.c                   |   75 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |  505 ++++---
 drivers/gpu/drm/i915/intel_ringbuffer.h            |   95 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  594 +++++++--
 drivers/gpu/drm/i915/intel_sdvo.c                  |   15 +-
 drivers/gpu/drm/i915/intel_sprite.c                |   91 +-
 drivers/gpu/drm/i915/intel_tv.c                    |    9 +-
 drivers/gpu/drm/i915/intel_uc.c                    |   15 +-
 drivers/gpu/drm/i915/intel_uc.h                    |    6 +-
 drivers/gpu/drm/i915/intel_uc_fw.c                 |   11 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  508 +------
 drivers/gpu/drm/i915/intel_vdsc.c                  |    5 +-
 drivers/gpu/drm/i915/intel_wopcm.c                 |    6 +-
 drivers/gpu/drm/i915/intel_workarounds.c           |  131 +-
 drivers/gpu/drm/i915/selftests/huge_pages.c        |   40 +-
 drivers/gpu/drm/i915/selftests/i915_gem.c          |   47 +-
 .../gpu/drm/i915/selftests/i915_gem_coherency.c    |    5 +-
 drivers/gpu/drm/i915/selftests/i915_gem_context.c  |   37 +-
 drivers/gpu/drm/i915/selftests/i915_gem_evict.c    |   18 +-
 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c      |   10 +-
 drivers/gpu/drm/i915/selftests/i915_gem_object.c   |   22 +-
 drivers/gpu/drm/i915/selftests/i915_request.c      |   29 +-
 drivers/gpu/drm/i915/selftests/igt_spinner.c       |   86 +-
 drivers/gpu/drm/i915/selftests/intel_guc.c         |   10 +-
 drivers/gpu/drm/i915/selftests/intel_hangcheck.c   |  327 ++++-
 drivers/gpu/drm/i915/selftests/intel_lrc.c         |   31 +-
 drivers/gpu/drm/i915/selftests/intel_workarounds.c |  120 +-
 drivers/gpu/drm/i915/selftests/mock_engine.c       |    2 -
 drivers/gpu/drm/i915/selftests/mock_gem_device.c   |   11 +-
 drivers/gpu/drm/i915/selftests/mock_gtt.c          |    6 +-
 drivers/gpu/drm/i915/vlv_dsi.c                     |   29 +-
 include/drm/drm_dp_helper.h                        |    4 +
 include/linux/mfd/intel_soc_pmic.h                 |    3 +
 136 files changed, 6422 insertions(+), 6140 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_reset.c
 create mode 100644 drivers/gpu/drm/i915/i915_reset.h
Merging drm-tegra/drm/tegra/for-next (db5adf4d6dce drm/tegra: hdmi: Fix audio to work with any pixel clock rate)
$ git merge drm-tegra/drm/tegra/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/tegra/Makefile |   1 +
 drivers/gpu/drm/tegra/drm.h    |   2 +-
 drivers/gpu/drm/tegra/hda.c    |  63 ++++++++++++
 drivers/gpu/drm/tegra/hda.h    |  20 ++++
 drivers/gpu/drm/tegra/hdmi.c   | 217 ++++++++++++-----------------------------
 drivers/gpu/drm/tegra/output.c |  11 ++-
 drivers/gpu/drm/tegra/sor.c    |  45 ++-------
 7 files changed, 169 insertions(+), 190 deletions(-)
 create mode 100644 drivers/gpu/drm/tegra/hda.c
 create mode 100644 drivers/gpu/drm/tegra/hda.h
Merging drm-misc/for-linux-next (bd59f2b153af drm/todo: Tick off some tinydrm entries)
$ git merge drm-misc/for-linux-next
Auto-merging include/drm/drm_dp_mst_helper.h
Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h
Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c
Removing drivers/gpu/drm/virtio/virtgpu_drm_bus.c
Auto-merging drivers/gpu/drm/tegra/sor.c
Auto-merging drivers/gpu/drm/tegra/hdmi.c
Auto-merging drivers/gpu/drm/sti/sti_hdmi.c
Auto-merging drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c
Auto-merging drivers/gpu/drm/msm/edp/edp_bridge.c
Auto-merging drivers/gpu/drm/msm/dsi/dsi_manager.c
Auto-merging drivers/gpu/drm/meson/meson_drv.c
Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c
Auto-merging drivers/gpu/drm/i915/vlv_dsi.c
Auto-merging drivers/gpu/drm/i915/intel_tv.c
Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/intel_lspcon.c
Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
Auto-merging drivers/gpu/drm/i915/intel_dvo.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c
Auto-merging drivers/gpu/drm/i915/intel_dp.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_ddi.c
Auto-merging drivers/gpu/drm/i915/intel_crt.c
Auto-merging drivers/gpu/drm/i915/intel_connector.c
Auto-merging drivers/gpu/drm/i915/icl_dsi.c
Auto-merging drivers/gpu/drm/i915/i915_debugfs.c
Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c
Auto-merging drivers/gpu/drm/drm_fb_helper.c
Auto-merging drivers/gpu/drm/drm_dp_helper.c
Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
Auto-merging drivers/gpu/drm/bridge/sii902x.c
Auto-merging drivers/gpu/drm/bridge/analogix-anx78xx.c
Removing drivers/gpu/drm/bochs/bochs_fbdev.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
Auto-merging MAINTAINERS
Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2a5b55b697bb] Merge remote-tracking branch 'drm-misc/for-linux-next'
$ git diff -M --stat --summary HEAD^..
 .../panel/{auo,g101evn010 => auo,g101evn010.txt}   |   0
 .../bindings/display/rockchip/rockchip-vop.txt     |   1 +
 Documentation/gpu/dp-mst/topology-figure-1.dot     |  52 ++
 Documentation/gpu/dp-mst/topology-figure-2.dot     |  56 ++
 Documentation/gpu/dp-mst/topology-figure-3.dot     |  59 ++
 Documentation/gpu/drm-internals.rst                |  12 +
 Documentation/gpu/drm-kms-helpers.rst              |  30 +-
 Documentation/gpu/todo.rst                         |  65 +-
 MAINTAINERS                                        |  17 +
 drivers/gpu/drm/Kconfig                            |   4 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |   2 +-
 drivers/gpu/drm/amd/amdgpu/atom.c                  |   2 +
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |   3 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |   2 +-
 .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c    |  11 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |   2 +
 drivers/gpu/drm/arc/arcpgu_drv.c                   |   6 +
 drivers/gpu/drm/arc/arcpgu_sim.c                   |   1 -
 drivers/gpu/drm/armada/armada_crtc.c               |   8 +-
 drivers/gpu/drm/ast/ast_fb.c                       |   4 +-
 drivers/gpu/drm/bochs/Makefile                     |   2 +-
 drivers/gpu/drm/bochs/bochs.h                      |  23 +-
 drivers/gpu/drm/bochs/bochs_drv.c                  |  35 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c                | 163 ----
 drivers/gpu/drm/bochs/bochs_hw.c                   |  19 +-
 drivers/gpu/drm/bochs/bochs_kms.c                  | 218 +++--
 drivers/gpu/drm/bochs/bochs_mm.c                   |  68 +-
 drivers/gpu/drm/bridge/analogix-anx78xx.c          |   5 +-
 drivers/gpu/drm/bridge/panel.c                     |  22 +-
 drivers/gpu/drm/bridge/sii902x.c                   |   3 +-
 drivers/gpu/drm/bridge/sil-sii8620.c               |   3 +-
 .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c    |   4 +
 drivers/gpu/drm/bridge/synopsys/dw-hdmi.c          |   3 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |   3 +
 drivers/gpu/drm/drm_crtc.c                         |  41 -
 drivers/gpu/drm/drm_crtc_helper.c                  |  58 +-
 drivers/gpu/drm/drm_crtc_internal.h                |   1 +
 drivers/gpu/drm/drm_damage_helper.c                |  41 +
 drivers/gpu/drm/drm_dp_helper.c                    |   3 +
 drivers/gpu/drm/drm_dp_mst_topology.c              | 946 ++++++++++++++++-----
 drivers/gpu/drm/drm_drv.c                          |  23 +-
 drivers/gpu/drm/drm_edid.c                         | 101 +--
 drivers/gpu/drm/drm_fb_cma_helper.c                | 137 +--
 drivers/gpu/drm/drm_fb_helper.c                    | 165 ++--
 drivers/gpu/drm/drm_flip_work.c                    |   1 +
 drivers/gpu/drm/drm_framebuffer.c                  |   1 +
 drivers/gpu/drm/drm_gem.c                          |  36 +-
 drivers/gpu/drm/drm_gem_framebuffer_helper.c       |  50 +-
 drivers/gpu/drm/drm_modes.c                        |   9 -
 drivers/gpu/drm/drm_of.c                           |   4 +-
 drivers/gpu/drm/drm_panel.c                        |   3 +
 drivers/gpu/drm/drm_plane.c                        |   3 +
 drivers/gpu/drm/drm_vblank.c                       |  45 +-
 drivers/gpu/drm/exynos/exynos_hdmi.c               |   3 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |  38 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h    |   4 -
 drivers/gpu/drm/i2c/ch7006_drv.c                   |   6 +-
 drivers/gpu/drm/i2c/tda998x_drv.c                  |   4 +-
 drivers/gpu/drm/i915/i915_debugfs.c                |   9 +-
 drivers/gpu/drm/i915/intel_connector.c             |   4 +
 drivers/gpu/drm/i915/intel_display.c               |   4 +
 drivers/gpu/drm/i915/intel_dp_mst.c                |  55 +-
 drivers/gpu/drm/i915/intel_drv.h                   |   1 -
 drivers/gpu/drm/i915/intel_hdmi.c                  |  20 +-
 drivers/gpu/drm/i915/intel_lspcon.c                |  16 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |  30 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   3 +-
 drivers/gpu/drm/meson/meson_drv.c                  |  20 +
 drivers/gpu/drm/meson/meson_dw_hdmi.c              |  12 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c               |   1 +
 drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c          |  10 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_dsi_encoder.c   |   9 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c   |   9 +-
 drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c  |   9 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c   |   9 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c          |   9 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_encoder.c       |   9 +-
 drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c           |   1 +
 drivers/gpu/drm/msm/dsi/dsi_manager.c              |   9 +-
 drivers/gpu/drm/msm/edp/edp_bridge.c               |   9 +-
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |   3 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |  26 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.h                  |   1 -
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.c          |   4 +-
 drivers/gpu/drm/nouveau/dispnv50/disp.c            | 103 ++-
 drivers/gpu/drm/nouveau/nouveau_display.c          |   2 +-
 drivers/gpu/drm/omapdrm/omap_connector.c           |   9 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   8 +-
 drivers/gpu/drm/omapdrm/omap_encoder.c             |   4 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |   1 +
 drivers/gpu/drm/panel/Kconfig                      |   9 +
 drivers/gpu/drm/panel/Makefile                     |   1 +
 drivers/gpu/drm/panel/panel-tpo-tpg110.c           | 496 +++++++++++
 drivers/gpu/drm/qxl/qxl_cmd.c                      |   2 +
 drivers/gpu/drm/qxl/qxl_display.c                  |   4 +-
 drivers/gpu/drm/radeon/atom.c                      |   2 +
 drivers/gpu/drm/radeon/radeon_audio.c              |  14 +-
 drivers/gpu/drm/radeon/radeon_display.c            |   2 +-
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c    |   1 +
 drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c             |   1 +
 drivers/gpu/drm/rockchip/inno_hdmi.c               |   4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |  36 -
 drivers/gpu/drm/rockchip/rockchip_drm_psr.c        |  37 +
 drivers/gpu/drm/rockchip/rockchip_drm_psr.h        |   3 +
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        | 157 +++-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h        |  15 +
 drivers/gpu/drm/rockchip/rockchip_vop_reg.c        | 180 +++-
 drivers/gpu/drm/rockchip/rockchip_vop_reg.h        |  53 ++
 drivers/gpu/drm/sti/sti_crtc.c                     |  16 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |   3 +-
 drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c             |   3 +-
 drivers/gpu/drm/tegra/hdmi.c                       |   3 +-
 drivers/gpu/drm/tegra/sor.c                        |   3 +-
 drivers/gpu/drm/tinydrm/core/tinydrm-core.c        |  24 +-
 drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c     | 100 +--
 drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c        |  32 +-
 drivers/gpu/drm/tinydrm/hx8357d.c                  |   3 +-
 drivers/gpu/drm/tinydrm/ili9225.c                  | 151 ++--
 drivers/gpu/drm/tinydrm/ili9341.c                  |   3 +-
 drivers/gpu/drm/tinydrm/mi0283qt.c                 |   3 +-
 drivers/gpu/drm/tinydrm/mipi-dbi.c                 |  97 ++-
 drivers/gpu/drm/tinydrm/repaper.c                  |  44 +-
 drivers/gpu/drm/tinydrm/st7586.c                   |  87 +-
 drivers/gpu/drm/tinydrm/st7735r.c                  |   3 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |   1 +
 drivers/gpu/drm/vc4/vc4_hdmi.c                     |  16 +-
 drivers/gpu/drm/vc4/vc4_plane.c                    |  17 +-
 drivers/gpu/drm/virtio/Makefile                    |   2 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |   7 +-
 drivers/gpu/drm/virtio/virtgpu_drm_bus.c           | 103 ---
 drivers/gpu/drm/virtio/virtgpu_drv.c               |  79 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |  10 +-
 drivers/gpu/drm/virtio/virtgpu_fence.c             |   8 -
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             |   2 +-
 drivers/gpu/drm/virtio/virtgpu_kms.c               |  10 +-
 drivers/gpu/drm/virtio/virtgpu_plane.c             |  17 +-
 drivers/gpu/drm/virtio/virtgpu_vq.c                |  12 +-
 drivers/gpu/drm/zte/zx_hdmi.c                      |   4 +-
 drivers/staging/vboxvideo/vbox_fb.c                |   5 -
 include/drm/bridge/dw_hdmi.h                       |   6 +-
 include/drm/drmP.h                                 |  24 +-
 include/drm/drm_atomic.h                           |   6 +-
 include/drm/drm_connector.h                        |   6 +
 include/drm/drm_crtc.h                             |   3 -
 include/drm/drm_crtc_helper.h                      |   1 +
 include/drm/drm_damage_helper.h                    |   3 +
 include/drm/drm_device.h                           | 288 +++++--
 include/drm/drm_dp_mst_helper.h                    | 151 +++-
 include/drm/drm_edid.h                             |  10 +-
 include/drm/drm_encoder_slave.h                    |   1 -
 include/drm/drm_fb_cma_helper.h                    |  22 -
 include/drm/drm_framebuffer.h                      |  10 +-
 include/drm/drm_gem_cma_helper.h                   |   5 +-
 include/drm/drm_gem_framebuffer_helper.h           |   3 +
 include/drm/drm_modes.h                            |  21 +-
 include/drm/drm_util.h                             |  53 +-
 include/drm/drm_vblank.h                           |  22 +
 include/drm/tinydrm/mipi-dbi.h                     |   5 +-
 include/drm/tinydrm/tinydrm-helpers.h              |  20 +-
 include/drm/tinydrm/tinydrm.h                      |  26 -
 include/linux/dma-fence-array.h                    |   1 +
 include/uapi/drm/drm_fourcc.h                      |  23 +
 164 files changed, 3679 insertions(+), 1970 deletions(-)
 rename Documentation/devicetree/bindings/display/panel/{auo,g101evn010 => auo,g101evn010.txt} (100%)
 create mode 100644 Documentation/gpu/dp-mst/topology-figure-1.dot
 create mode 100644 Documentation/gpu/dp-mst/topology-figure-2.dot
 create mode 100644 Documentation/gpu/dp-mst/topology-figure-3.dot
 delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
 create mode 100644 drivers/gpu/drm/panel/panel-tpo-tpg110.c
 delete mode 100644 drivers/gpu/drm/virtio/virtgpu_drm_bus.c
Merging drm-msm/msm-next (61a5d46545fc dt-bindings: drm/msm/a6xx: Document GMU bindings)
$ git merge drm-msm/msm-next
Auto-merging drivers/gpu/drm/msm/msm_rd.c
Auto-merging drivers/gpu/drm/msm/msm_gpu.c
Auto-merging drivers/gpu/drm/msm/msm_gem.c
Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/display/msm/gmu.txt        | 59 ++++++++++++++++++++++
 .../devicetree/bindings/display/msm/gpu.txt        | 43 ++++++++++++++--
 drivers/gpu/drm/msm/adreno/a6xx_gmu.c              |  2 +-
 drivers/gpu/drm/msm/adreno/adreno_gpu.c            |  1 -
 drivers/gpu/drm/msm/msm_drv.h                      |  3 +-
 drivers/gpu/drm/msm/msm_gem.c                      |  9 +++-
 drivers/gpu/drm/msm/msm_gem_vma.c                  |  5 +-
 drivers/gpu/drm/msm/msm_gpu.c                      |  2 +-
 drivers/gpu/drm/msm/msm_gpu.h                      |  3 +-
 drivers/gpu/drm/msm/msm_rd.c                       |  7 ++-
 10 files changed, 119 insertions(+), 15 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/msm/gmu.txt
Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
$ git merge hdlcd/for-upstream/hdlcd
Already up to date.
Merging mali-dp/for-upstream/mali-dp (7e8d4fcf8daf drm: arm/komeda: Remove IRQ parsing from initial series)
$ git merge mali-dp/for-upstream/mali-dp
Auto-merging include/uapi/drm/drm_fourcc.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/display/arm,komeda.txt     |  73 +++
 Documentation/gpu/afbc.rst                         | 235 ++++++++++
 Documentation/gpu/drivers.rst                      |   2 +
 Documentation/gpu/komeda-kms.rst                   | 488 +++++++++++++++++++++
 MAINTAINERS                                        |  15 +-
 drivers/gpu/drm/Makefile                           |   2 +-
 drivers/gpu/drm/arm/Kconfig                        |  12 +-
 drivers/gpu/drm/arm/Makefile                       |   1 +
 drivers/gpu/drm/arm/display/Kbuild                 |   3 +
 drivers/gpu/drm/arm/display/Kconfig                |  14 +
 drivers/gpu/drm/arm/display/include/malidp_io.h    |  42 ++
 .../gpu/drm/arm/display/include/malidp_product.h   |  23 +
 drivers/gpu/drm/arm/display/include/malidp_utils.h |  16 +
 drivers/gpu/drm/arm/display/komeda/Makefile        |  21 +
 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c   | 111 +++++
 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c   | 106 +++++
 drivers/gpu/drm/arm/display/komeda/komeda_dev.c    | 187 ++++++++
 drivers/gpu/drm/arm/display/komeda/komeda_dev.h    | 110 +++++
 drivers/gpu/drm/arm/display/komeda/komeda_drv.c    | 144 ++++++
 .../drm/arm/display/komeda/komeda_format_caps.c    |  75 ++++
 .../drm/arm/display/komeda/komeda_format_caps.h    |  89 ++++
 .../drm/arm/display/komeda/komeda_framebuffer.c    | 165 +++++++
 .../drm/arm/display/komeda/komeda_framebuffer.h    |  34 ++
 drivers/gpu/drm/arm/display/komeda/komeda_kms.c    | 167 +++++++
 drivers/gpu/drm/arm/display/komeda/komeda_kms.h    | 113 +++++
 .../gpu/drm/arm/display/komeda/komeda_pipeline.c   | 200 +++++++++
 .../gpu/drm/arm/display/komeda/komeda_pipeline.h   | 359 +++++++++++++++
 drivers/gpu/drm/arm/display/komeda/komeda_plane.c  | 109 +++++
 .../drm/arm/display/komeda/komeda_private_obj.c    |  88 ++++
 include/uapi/drm/drm_fourcc.h                      |   3 +
 30 files changed, 2999 insertions(+), 8 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/arm,komeda.txt
 create mode 100644 Documentation/gpu/afbc.rst
 create mode 100644 Documentation/gpu/komeda-kms.rst
 create mode 100644 drivers/gpu/drm/arm/display/Kbuild
 create mode 100644 drivers/gpu/drm/arm/display/Kconfig
 create mode 100644 drivers/gpu/drm/arm/display/include/malidp_io.h
 create mode 100644 drivers/gpu/drm/arm/display/include/malidp_product.h
 create mode 100644 drivers/gpu/drm/arm/display/include/malidp_utils.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/Makefile
 create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_crtc.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_dev.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_drv.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_format_caps.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_framebuffer.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_kms.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline.h
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_plane.c
 create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
$ git am -3 ../patches/0001-drm-komeda-merge-fix-for-drm_atomic_private_obj_init.patch
Applying: drm/komeda: merge fix for drm_atomic_private_obj_init() API change
$ git reset HEAD^
Unstaged changes after reset:
M	drivers/gpu/drm/arm/display/komeda/komeda_private_obj.c
$ git add -A .
$ git commit -v -a --amend
[master 04d135b85312] Merge remote-tracking branch 'mali-dp/for-upstream/mali-dp'
 Date: Fri Jan 18 11:18:46 2019 +1100
Merging imx-drm/imx-drm/next (97144d12df00 drm/imx: Allow building under COMPILE_TEST)
$ git merge imx-drm/imx-drm/next
Auto-merging include/video/imx-ipu-v3.h
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/imx/Kconfig        |  2 +-
 drivers/gpu/drm/imx/imx-drm-core.c |  7 +---
 drivers/gpu/drm/imx/imx-ldb.c      | 25 ++++++++----
 drivers/gpu/drm/imx/ipuv3-plane.c  | 80 +++++++++++++++++++++++++-------------
 drivers/gpu/drm/imx/ipuv3-plane.h  |  2 +
 drivers/gpu/ipu-v3/ipu-common.c    |  8 ++--
 drivers/gpu/ipu-v3/ipu-pre.c       |  6 +++
 drivers/gpu/ipu-v3/ipu-prg.c       | 16 ++++++++
 drivers/gpu/ipu-v3/ipu-prv.h       |  1 +
 include/video/imx-ipu-v3.h         |  1 +
 10 files changed, 103 insertions(+), 45 deletions(-)
Merging etnaviv/etnaviv/next (fd4b77e8deea drm/etnaviv: don't restrict to certain architectures)
$ git merge etnaviv/etnaviv/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                  | 2 +-
 drivers/gpu/drm/etnaviv/Kconfig              | 1 -
 drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h     | 2 --
 drivers/gpu/drm/etnaviv/etnaviv_dump.c       | 2 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.h        | 1 +
 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +-
 drivers/gpu/drm/etnaviv/etnaviv_perfmon.c    | 6 +++---
 drivers/gpu/drm/etnaviv/etnaviv_sched.c      | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
Merging kconfig/for-next (bebc6082da0a Linux 4.14)
$ git merge kconfig/for-next
Already up to date.
Merging regmap/for-next (b3ffce399349 Merge branch 'regmap-5.0' into regmap-linus)
$ git merge regmap/for-next
Already up to date.
Merging sound/for-next (053b055948e9 ALSA: hda: program stripe control for codec)
$ git merge sound/for-next
Merge made by the 'recursive' strategy.
 include/sound/hda_register.h     |  2 ++
 include/sound/hda_verbs.h        |  2 ++
 include/sound/hdaudio.h          |  3 ++
 sound/hda/hdac_controller.c      |  8 +++--
 sound/hda/hdac_stream.c          | 44 ++++++++++++++++++++++++-
 sound/isa/gus/gus_main.c         | 13 ++++++--
 sound/isa/sb/sb16_main.c         | 10 ++++--
 sound/pci/hda/patch_hdmi.c       | 10 +++++-
 sound/pci/ice1712/ews.c          |  7 +++-
 sound/pci/oxygen/oxygen_lib.c    |  2 +-
 sound/pci/oxygen/pcm1796.h       |  1 -
 sound/pci/oxygen/xonar_pcm179x.c | 71 ++++++++++++++++++++++++++++++++++++++--
 sound/usb/line6/pod.c            |  3 +-
 sound/usb/mixer.c                |  6 +---
 14 files changed, 161 insertions(+), 21 deletions(-)
Merging sound-asoc/for-next (aaafa148ca02 Merge branch 'asoc-5.1' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/generic/simple-scu-card.c
Removing sound/soc/generic/audio-graph-scu-card.c
Removing Documentation/devicetree/bindings/sound/simple-scu-card.txt
Removing Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/sound/ak4458.txt |   2 +-
 .../bindings/sound/audio-graph-scu-card.txt        | 123 ---
 Documentation/devicetree/bindings/sound/cs4341.txt |  22 +
 .../bindings/sound/davinci-mcasp-audio.txt         |  17 +
 .../devicetree/bindings/sound/fsl,micfil.txt       |  32 +
 .../bindings/sound/rockchip,rk3328-codec.txt       |  23 +
 .../devicetree/bindings/sound/sgtl5000.txt         |   9 +
 .../devicetree/bindings/sound/simple-scu-card.txt  |  94 ---
 .../bindings/sound/xlnx,audio-formatter.txt        |  29 +
 .../devicetree/bindings/sound/xlnx,spdif.txt       |  28 +
 sound/soc/codecs/Kconfig                           |  16 +-
 sound/soc/codecs/Makefile                          |   4 +
 sound/soc/codecs/adau7002.c                        |  45 ++
 sound/soc/codecs/ak4458.c                          |  79 +-
 sound/soc/codecs/cs4271.c                          |   4 +-
 sound/soc/codecs/cs4341.c                          | 346 +++++++++
 sound/soc/codecs/da7219-aad.c                      |   2 +-
 sound/soc/codecs/da7219.c                          |  85 ++-
 sound/soc/codecs/da7219.h                          |   1 +
 sound/soc/codecs/dmic.c                            |   4 +-
 sound/soc/codecs/es8316.c                          | 200 ++++-
 sound/soc/codecs/es8316.h                          |   7 +
 sound/soc/codecs/max98090.c                        |  15 -
 sound/soc/codecs/max98373.c                        |   6 +-
 sound/soc/codecs/max98927.c                        |   8 +-
 sound/soc/codecs/msm8916-wcd-digital.c             |  10 -
 sound/soc/codecs/mt6351.c                          |   4 +-
 sound/soc/codecs/nau8824.c                         |   2 +-
 sound/soc/codecs/nau8825.c                         |   1 +
 sound/soc/codecs/rk3328_codec.c                    | 519 +++++++++++++
 sound/soc/codecs/rk3328_codec.h                    | 210 ++++++
 sound/soc/codecs/rl6347a.c                         |   4 +-
 sound/soc/codecs/rt274.c                           |  19 +-
 sound/soc/codecs/rt286.c                           |   8 +-
 sound/soc/codecs/rt298.c                           |  12 +-
 sound/soc/codecs/rt5514.c                          |   1 +
 sound/soc/codecs/rt5640.c                          |   6 +-
 sound/soc/codecs/rt5645.c                          |  66 +-
 sound/soc/codecs/rt5651.c                          |  61 +-
 sound/soc/codecs/rt5651.h                          |   1 +
 sound/soc/codecs/rt5670.c                          |  54 --
 sound/soc/codecs/rt5677.c                          |   8 +-
 sound/soc/codecs/rt5682.c                          |   8 +
 sound/soc/codecs/sgtl5000.c                        |  19 +-
 sound/soc/codecs/tlv320aic32x4.c                   |  30 +-
 sound/soc/codecs/tlv320aic32x4.h                   |   1 +
 sound/soc/codecs/tscs42xx.c                        |   2 +-
 sound/soc/codecs/wm8904.c                          |  21 +-
 sound/soc/fsl/Kconfig                              |   9 +
 sound/soc/fsl/Makefile                             |   2 +
 sound/soc/fsl/fsl_micfil.c                         | 826 +++++++++++++++++++++
 sound/soc/fsl/fsl_micfil.h                         | 283 +++++++
 sound/soc/generic/Kconfig                          |  17 -
 sound/soc/generic/Makefile                         |   4 -
 sound/soc/generic/audio-graph-card.c               | 465 +++++++-----
 sound/soc/generic/audio-graph-scu-card.c           | 501 -------------
 sound/soc/generic/simple-card-utils.c              |  14 +-
 sound/soc/generic/simple-card.c                    | 454 ++++++-----
 sound/soc/generic/simple-scu-card.c                | 474 ------------
 sound/soc/intel/atom/sst-atom-controls.c           |   2 +-
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   2 +-
 sound/soc/intel/atom/sst/sst_acpi.c                |  45 +-
 sound/soc/intel/atom/sst/sst_drv_interface.c       |   2 +-
 sound/soc/intel/atom/sst/sst_loader.c              |   2 +-
 sound/soc/intel/baytrail/sst-baytrail-ipc.c        |   3 +-
 sound/soc/intel/baytrail/sst-baytrail-pcm.c        |   2 +-
 sound/soc/intel/boards/bytcht_es8316.c             | 327 +++++++-
 sound/soc/intel/boards/bytcr_rt5640.c              |  12 +
 sound/soc/intel/boards/bytcr_rt5651.c              | 103 ++-
 sound/soc/intel/boards/glk_rt5682_max98357a.c      |   2 +-
 sound/soc/intel/boards/kbl_da7219_max98927.c       |   4 +-
 sound/soc/intel/common/soc-acpi-intel-byt-match.c  |  44 +-
 sound/soc/intel/haswell/sst-haswell-ipc.c          |   2 +-
 sound/soc/intel/haswell/sst-haswell-pcm.c          |   4 +-
 sound/soc/intel/skylake/skl-messages.c             |   2 +-
 sound/soc/intel/skylake/skl-pcm.c                  |   2 +-
 sound/soc/intel/skylake/skl-topology.c             |   2 +-
 sound/soc/pxa/Makefile                             |   1 -
 sound/soc/qcom/Kconfig                             |   1 +
 sound/soc/qcom/sdm845.c                            |   2 +
 sound/soc/sh/rcar/src.c                            | 125 +++-
 sound/soc/ti/davinci-mcasp.c                       | 175 ++++-
 sound/soc/xilinx/Kconfig                           |  14 +
 sound/soc/xilinx/Makefile                          |   4 +
 sound/soc/xilinx/xlnx_formatter_pcm.c              | 708 ++++++++++++++++++
 sound/soc/xilinx/xlnx_spdif.c                      | 339 +++++++++
 86 files changed, 5315 insertions(+), 1933 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
 create mode 100644 Documentation/devicetree/bindings/sound/cs4341.txt
 create mode 100644 Documentation/devicetree/bindings/sound/fsl,micfil.txt
 create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3328-codec.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/simple-scu-card.txt
 create mode 100644 Documentation/devicetree/bindings/sound/xlnx,audio-formatter.txt
 create mode 100644 Documentation/devicetree/bindings/sound/xlnx,spdif.txt
 create mode 100644 sound/soc/codecs/cs4341.c
 create mode 100644 sound/soc/codecs/rk3328_codec.c
 create mode 100644 sound/soc/codecs/rk3328_codec.h
 create mode 100644 sound/soc/fsl/fsl_micfil.c
 create mode 100644 sound/soc/fsl/fsl_micfil.h
 delete mode 100644 sound/soc/generic/audio-graph-scu-card.c
 delete mode 100644 sound/soc/generic/simple-scu-card.c
 create mode 100644 sound/soc/xilinx/xlnx_formatter_pcm.c
 create mode 100644 sound/soc/xilinx/xlnx_spdif.c
Merging modules/modules-next (93d77e7f1410 ARM: module: Fix function kallsyms on Thumb-2)
$ git merge modules/modules-next
Already up to date.
Merging input/next (b6eba86030bf Input: edt-ft5x06 - add offset support for ev-ft5726)
$ git merge input/next
Merge made by the 'recursive' strategy.
 .../bindings/input/cypress,tm2-touchkey.txt        |   9 +-
 .../bindings/input/touchscreen/edt-ft5x06.txt      |  13 +-
 drivers/input/keyboard/mcs_touchkey.c              |   5 +-
 drivers/input/keyboard/mtk-pmic-keys.c             |  13 +-
 drivers/input/keyboard/tca6416-keypad.c            |   4 +-
 drivers/input/keyboard/tm2-touchkey.c              | 132 ++++++++++++++++-----
 drivers/input/misc/soc_button_array.c              |   6 +-
 drivers/input/touchscreen/ad7879.c                 |  11 +-
 drivers/input/touchscreen/edt-ft5x06.c             | 110 +++++++++++++++--
 9 files changed, 243 insertions(+), 60 deletions(-)
Merging block/for-next (fae5efba43c2 mtip32xx: Ń•top abusing the managed resource APIs)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
 drivers/block/mtip32xx/mtip32xx.c | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)
Merging device-mapper/for-next (d445bd9cec1a dm thin: fix passdown_double_checking_shared_status())
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
 drivers/md/dm-crypt.c         | 25 +++++++++++++++++--------
 drivers/md/dm-thin-metadata.c |  4 ++--
 drivers/md/dm-thin-metadata.h |  2 +-
 drivers/md/dm-thin.c          | 10 +++++-----
 4 files changed, 25 insertions(+), 16 deletions(-)
Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
$ git merge pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (e0fc4f56e724 mmc: sdhci-esdhc-imx: add DCMD support for CMDQ)
$ git merge mmc/next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/fsl-imx-esdhc.txt      |   1 +
 Documentation/devicetree/bindings/mmc/ti-omap.txt  |  28 --
 drivers/mmc/core/block.c                           |   9 +-
 drivers/mmc/core/sdio_bus.c                        |   3 +-
 drivers/mmc/host/Kconfig                           |   1 +
 drivers/mmc/host/sdhci-brcmstb.c                   |   4 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 | 286 ++++++++++++++++++---
 drivers/mmc/host/sdhci-pci-core.c                  |  10 -
 drivers/mmc/host/sdhci-pci-o2micro.c               | 140 +++++++++-
 drivers/mmc/host/sdhci-pci.h                       |   6 +-
 drivers/mmc/host/sdhci.c                           |  16 +-
 drivers/mmc/host/sdhci.h                           |   4 +
 drivers/mmc/host/sdhci_am654.c                     |   2 +-
 drivers/mmc/host/tmio_mmc_core.c                   |   3 +-
 14 files changed, 413 insertions(+), 100 deletions(-)
Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_support.c
Auto-merging kernel/debug/kdb/kdb_main.c
Auto-merging kernel/debug/kdb/kdb_bt.c
CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c
Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 30c3e9ff6b1f] Merge remote-tracking branch 'kgdb/kgdb-next'
$ git diff -M --stat --summary HEAD^..
Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier)
$ git merge md/for-next
Already up to date.
Merging mfd/for-mfd-next (c52b8fd546d8 mfd: wm8400-core: Make it explicitly non-modular)
$ git merge mfd/for-mfd-next
Merge made by the 'recursive' strategy.
 drivers/mfd/aat2870-core.c      | 40 +++-------------------------------------
 drivers/mfd/adp5520.c           | 30 +++++++-----------------------
 drivers/mfd/as3711.c            | 14 --------------
 drivers/mfd/db8500-prcmu.c      | 10 ++++------
 drivers/mfd/htc-i2cpld.c        | 18 +-----------------
 drivers/mfd/max8925-core.c      |  7 +------
 drivers/mfd/rc5t583.c           | 14 --------------
 drivers/mfd/sta2x11-mfd.c       | 10 ++++------
 drivers/mfd/syscon.c            | 12 +-----------
 drivers/mfd/tps65090.c          | 30 +++++-------------------------
 drivers/mfd/tps65910.c          | 18 +-----------------
 drivers/mfd/tps80031.c          | 37 ++-----------------------------------
 drivers/mfd/wm831x-core.c       | 15 ++-------------
 drivers/mfd/wm831x-i2c.c        | 20 ++------------------
 drivers/mfd/wm831x-spi.c        | 24 ++----------------------
 drivers/mfd/wm8350-core.c       | 30 ++----------------------------
 drivers/mfd/wm8350-i2c.c        | 24 +-----------------------
 drivers/mfd/wm8400-core.c       | 18 +++---------------
 include/linux/mfd/wm831x/core.h |  1 -
 include/linux/mfd/wm8350/core.h |  1 -
 20 files changed, 41 insertions(+), 332 deletions(-)
Merging backlight/for-backlight-next (3cee7a7d05b1 backlight: 88pm860x_bl: Use of_node_name_eq for node name comparisons)
$ git merge backlight/for-backlight-next
Already up to date.
Merging battery/for-next (958091396648 power: supply: bq25890: fix BAT_COMP field definition)
$ git merge battery/for-next
Already up to date.
Merging regulator/for-next (1488c1d4973a Merge branch 'regulator-5.1' into regulator-next)
$ git merge regulator/for-next
Removing Documentation/devicetree/bindings/regulator/fixed-regulator.txt
Merge made by the 'recursive' strategy.
 .../bindings/regulator/fixed-regulator.txt         | 35 -----------
 .../bindings/regulator/fixed-regulator.yaml        | 67 ++++++++++++++++++++++
 .../devicetree/bindings/regulator/pfuze100.txt     |  2 +-
 drivers/regulator/Kconfig                          |  8 +--
 drivers/regulator/act8865-regulator.c              |  5 +-
 drivers/regulator/act8945a-regulator.c             | 11 ++--
 drivers/regulator/axp20x-regulator.c               |  8 ++-
 drivers/regulator/core.c                           | 22 ++++---
 drivers/regulator/hi655x-regulator.c               |  1 -
 drivers/regulator/lp8755.c                         |  4 +-
 drivers/regulator/max14577-regulator.c             |  1 -
 drivers/regulator/of_regulator.c                   |  4 +-
 drivers/regulator/pwm-regulator.c                  | 17 ++----
 drivers/regulator/twl6030-regulator.c              |  7 +--
 include/linux/regulator/driver.h                   |  1 +
 15 files changed, 112 insertions(+), 81 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
Merging security/next-testing (f30160f982fc Merge branch 'next-general' into next-testing)
$ git merge security/next-testing
Auto-merging security/yama/yama_lsm.c
Auto-merging security/smack/smack_lsm.c
Auto-merging security/smack/smack.h
Auto-merging security/selinux/hooks.c
Removing security/selinux/exports.c
Auto-merging security/security.c
Auto-merging kernel/seccomp.c
Removing include/linux/selinux.h
Auto-merging include/linux/security.h
Auto-merging include/linux/lsm_hooks.h
Auto-merging fs/proc/internal.h
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/LSM/index.rst         |  13 +-
 Documentation/admin-guide/kernel-parameters.txt |   4 +
 fs/proc/base.c                                  |  64 ++-
 fs/proc/internal.h                              |   1 +
 include/linux/cred.h                            |   1 -
 include/linux/lsm_hooks.h                       |  48 +-
 include/linux/security.h                        |  43 +-
 include/linux/selinux.h                         |  35 --
 kernel/capability.c                             |  22 +-
 kernel/cred.c                                   |  13 -
 kernel/seccomp.c                                |   4 +-
 security/Kconfig                                |  41 +-
 security/apparmor/Kconfig                       |  16 -
 security/apparmor/capability.c                  |  14 +-
 security/apparmor/domain.c                      |   2 +-
 security/apparmor/include/capability.h          |   2 +-
 security/apparmor/include/cred.h                |  16 +-
 security/apparmor/include/file.h                |   5 +-
 security/apparmor/include/lib.h                 |   4 +
 security/apparmor/include/task.h                |  18 +-
 security/apparmor/ipc.c                         |   3 +-
 security/apparmor/lsm.c                         |  69 ++-
 security/apparmor/resource.c                    |   2 +-
 security/apparmor/task.c                        |   6 +-
 security/commoncap.c                            |  26 +-
 security/loadpin/loadpin.c                      |   8 +-
 security/security.c                             | 649 +++++++++++++++++++++---
 security/selinux/Kconfig                        |  15 -
 security/selinux/Makefile                       |   2 +-
 security/selinux/exports.c                      |  23 -
 security/selinux/hooks.c                        | 363 ++++---------
 security/selinux/include/audit.h                |   3 -
 security/selinux/include/objsec.h               |  38 +-
 security/selinux/selinuxfs.c                    |   4 +-
 security/selinux/ss/services.c                  |   1 -
 security/selinux/xfrm.c                         |   4 +-
 security/smack/smack.h                          |  44 +-
 security/smack/smack_access.c                   |   6 +-
 security/smack/smack_lsm.c                      | 316 ++++--------
 security/smack/smackfs.c                        |  18 +-
 security/tomoyo/common.h                        |  22 +-
 security/tomoyo/domain.c                        |   4 +-
 security/tomoyo/securityfs_if.c                 |  15 +-
 security/tomoyo/tomoyo.c                        |  49 +-
 security/yama/yama_lsm.c                        |   8 +-
 45 files changed, 1204 insertions(+), 860 deletions(-)
 delete mode 100644 include/linux/selinux.h
 delete mode 100644 security/selinux/exports.c
Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute)
$ git merge apparmor/apparmor-next
Auto-merging security/apparmor/lsm.c
Merge made by the 'recursive' strategy.
 security/apparmor/lsm.c | 2 ++
 1 file changed, 2 insertions(+)
Merging integrity/next-integrity (eed9de3b4f47 ima: Use inode_is_open_for_write)
$ git merge integrity/next-integrity
Already up to date.
Merging selinux/next (53e0c2aa9a59 selinux: do not override context on context mounts)
$ git merge selinux/next
Auto-merging security/selinux/hooks.c
Merge made by the 'recursive' strategy.
 security/selinux/avc.c         | 37 +++++++++++++--------------
 security/selinux/hooks.c       | 58 ++++++++++++++++++++++++++++++++----------
 security/selinux/include/avc.h |  6 +----
 3 files changed, 63 insertions(+), 38 deletions(-)
Merging tpmdd/next (c1a85a00ea66 LSM: generalize flag passing to security_capable)
$ git merge tpmdd/next
Already up to date.
Merging watchdog/master (4a22fc534f2f watchdog: tqmx86: Fix a couple IS_ERR() vs NULL bugs)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
 drivers/watchdog/mt7621_wdt.c | 1 +
 drivers/watchdog/rt2880_wdt.c | 1 +
 drivers/watchdog/tqmx86_wdt.c | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)
Merging iommu/next (33798a966b8b Merge branches 'iommu/fixes', 'arm/msm', 'x86/vt-d' and 'core' into next)
$ git merge iommu/next
Merge made by the 'recursive' strategy.
 drivers/Makefile            |  2 +-
 drivers/iommu/Kconfig       |  7 +++--
 drivers/iommu/intel-svm.c   | 77 ++++++++++++++++++++++++++-------------------
 drivers/iommu/msm_iommu.c   |  8 ++---
 drivers/iommu/of_iommu.c    |  2 +-
 include/linux/intel-iommu.h | 21 ++++++-------
 include/linux/intel-svm.h   |  2 +-
 7 files changed, 65 insertions(+), 54 deletions(-)
Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
$ git merge dwmw2-iommu/master
Already up to date.
Merging vfio/next (8ba35b3a0046 vfio-mdev/samples: Use u8 instead of char for handle functions)
$ git merge vfio/next
Already up to date.
Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
$ git merge trivial/for-next
Already up to date.
Merging audit/next (9e36a5d49c3a audit: hand taken context to audit_kill_trees for syscall logging)
$ git merge audit/next
Merge made by the 'recursive' strategy.
 kernel/audit.c      |  7 +++++--
 kernel/audit.h      |  4 ++--
 kernel/audit_tree.c | 19 +++++++++++--------
 kernel/auditsc.c    | 12 ++++++------
 4 files changed, 24 insertions(+), 18 deletions(-)
Merging devicetree/for-next (5801169a2ed2 of: __of_detach_node() - remove node from phandle cache)
$ git merge devicetree/for-next
Already up to date.
Merging mailbox/mailbox-for-next (d69e11648e48 mailbox: tegra-hsp: Use device-managed registration API)
$ git merge mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (408fa9bbcd98 Merge branch 'spi-5.1' into spi-next)
$ git merge spi/for-next
Removing drivers/mtd/spi-nor/fsl-quadspi.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt}  |   18 +-
 .../devicetree/bindings/spi/spi-stm32.txt          |    9 +-
 MAINTAINERS                                        |    4 +-
 arch/mips/ath79/dev-spi.h                          |    2 +-
 drivers/mtd/spi-nor/Kconfig                        |    9 -
 drivers/mtd/spi-nor/Makefile                       |    1 -
 drivers/mtd/spi-nor/fsl-quadspi.c                  | 1224 -----------------
 drivers/spi/Kconfig                                |   17 +-
 drivers/spi/Makefile                               |    1 +
 drivers/spi/spi-ath79.c                            |  114 +-
 drivers/spi/spi-atmel.c                            |   93 +-
 drivers/spi/spi-bitbang.c                          |   13 -
 drivers/spi/spi-cadence.c                          |   78 +-
 drivers/spi/spi-clps711x.c                         |   23 +-
 drivers/spi/spi-davinci.c                          |   54 +-
 drivers/spi/spi-dw-mmio.c                          |   22 -
 drivers/spi/spi-dw.c                               |   13 +-
 drivers/spi/spi-fsl-qspi.c                         |  966 ++++++++++++++
 drivers/spi/spi-geni-qcom.c                        |   56 +-
 drivers/spi/spi-stm32.c                            | 1403 +++++++++++++++-----
 drivers/spi/spi.c                                  |  226 +++-
 .../linux/platform_data/spi-ath79.h                |    0
 include/linux/spi/spi.h                            |   25 +-
 include/trace/events/spi.h                         |   31 +-
 24 files changed, 2402 insertions(+), 2000 deletions(-)
 rename Documentation/devicetree/bindings/{mtd/fsl-quadspi.txt => spi/spi-fsl-qspi.txt} (73%)
 delete mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c
 create mode 100644 drivers/spi/spi-fsl-qspi.c
 rename arch/mips/include/asm/mach-ath79/ath79_spi_platform.h => include/linux/platform_data/spi-ath79.h (100%)
Merging tip/auto-latest (28948fd5d5b7 Merge branch 'linus')
$ git merge tip/auto-latest
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |    8 +
 Documentation/kdump/vmcoreinfo.txt              |  495 +++++
 Kbuild                                          |   18 +-
 MAINTAINERS                                     |    1 +
 arch/arm64/include/asm/atomic.h                 |  237 +--
 arch/arm64/include/asm/atomic_ll_sc.h           |   28 +-
 arch/arm64/include/asm/atomic_lse.h             |   38 +-
 arch/arm64/include/asm/cmpxchg.h                |   60 +-
 arch/arm64/include/asm/sync_bitops.h            |   16 +-
 arch/x86/boot/Makefile                          |    2 +-
 arch/x86/boot/compressed/vmlinux.lds.S          |    2 +-
 arch/x86/boot/setup.ld                          |    2 +-
 arch/x86/include/asm/alternative.h              |   39 +-
 arch/x86/include/asm/bitops.h                   |    6 -
 arch/x86/include/asm/mmu_context.h              |   18 +
 arch/x86/include/asm/msr.h                      |   16 +-
 arch/x86/include/asm/string_32.h                |  104 -
 arch/x86/include/asm/string_64.h                |   15 -
 arch/x86/kernel/alternative.c                   |    4 +-
 arch/x86/kernel/cpu/mce/amd.c                   |   36 +
 arch/x86/kernel/cpu/mce/apei.c                  |   10 +-
 arch/x86/kernel/cpu/mce/core.c                  |   30 -
 arch/x86/kernel/crash.c                         |    1 +
 arch/x86/kernel/e820.c                          |    9 +-
 arch/x86/kernel/hpet.c                          |    4 -
 arch/x86/kernel/kexec-bzimage64.c               |    2 +
 arch/x86/kernel/machine_kexec_64.c              |    3 +
 arch/x86/kernel/tsc.c                           |   30 +-
 arch/x86/kernel/vmlinux.lds.S                   |    4 +-
 arch/x86/lib/kaslr.c                            |    4 +-
 arch/x86/mm/mem_encrypt_identity.c              |    4 +-
 arch/x86/platform/uv/tlb_uv.c                   |    8 +-
 arch/x86/realmode/rm/Makefile                   |    2 +-
 arch/x86/realmode/rm/realmode.lds.S             |    2 +-
 drivers/firmware/efi/efi.c                      |    3 +
 include/asm-generic/atomic-instrumented.h       | 1688 +++++++++++++++--
 include/asm-generic/atomic-long.h               | 1173 +++++++++---
 include/linux/atomic-fallback.h                 | 2294 +++++++++++++++++++++++
 include/linux/atomic.h                          | 1241 +-----------
 include/linux/interrupt.h                       |    1 +
 include/linux/posix-timers.h                    |    2 +-
 kernel/irq/handle.c                             |    2 +-
 kernel/irq/manage.c                             |    4 +
 kernel/rcu/Kconfig                              |   30 -
 kernel/time/Kconfig                             |   29 +
 kernel/time/posix-cpu-timers.c                  |   12 +-
 kernel/watchdog.c                               |    7 +
 scripts/atomic/atomic-tbl.sh                    |  186 ++
 scripts/atomic/atomics.tbl                      |   41 +
 scripts/atomic/check-atomics.sh                 |   19 +
 scripts/atomic/fallbacks/acquire                |    9 +
 scripts/atomic/fallbacks/add_negative           |   16 +
 scripts/atomic/fallbacks/add_unless             |   16 +
 scripts/atomic/fallbacks/andnot                 |    7 +
 scripts/atomic/fallbacks/dec                    |    7 +
 scripts/atomic/fallbacks/dec_and_test           |   15 +
 scripts/atomic/fallbacks/dec_if_positive        |   15 +
 scripts/atomic/fallbacks/dec_unless_positive    |   14 +
 scripts/atomic/fallbacks/fence                  |   11 +
 scripts/atomic/fallbacks/fetch_add_unless       |   23 +
 scripts/atomic/fallbacks/inc                    |    7 +
 scripts/atomic/fallbacks/inc_and_test           |   15 +
 scripts/atomic/fallbacks/inc_not_zero           |   14 +
 scripts/atomic/fallbacks/inc_unless_negative    |   14 +
 scripts/atomic/fallbacks/read_acquire           |    7 +
 scripts/atomic/fallbacks/release                |    8 +
 scripts/atomic/fallbacks/set_release            |    7 +
 scripts/atomic/fallbacks/sub_and_test           |   16 +
 scripts/atomic/fallbacks/try_cmpxchg            |   11 +
 scripts/atomic/gen-atomic-fallback.sh           |  181 ++
 scripts/atomic/gen-atomic-instrumented.sh       |  182 ++
 scripts/atomic/gen-atomic-long.sh               |  101 +
 tools/memory-model/.gitignore                   |    1 +
 tools/memory-model/README                       |    2 +
 tools/memory-model/linux-kernel.bell            |    3 +-
 tools/memory-model/linux-kernel.cat             |    4 +-
 tools/memory-model/linux-kernel.def             |    1 +
 tools/memory-model/scripts/README               |   70 +
 tools/memory-model/scripts/checkalllitmus.sh    |   53 +-
 tools/memory-model/scripts/checkghlitmus.sh     |   65 +
 tools/memory-model/scripts/checklitmus.sh       |   74 +-
 tools/memory-model/scripts/checklitmushist.sh   |   60 +
 tools/memory-model/scripts/cmplitmushist.sh     |   87 +
 tools/memory-model/scripts/initlitmushist.sh    |   68 +
 tools/memory-model/scripts/judgelitmus.sh       |   78 +
 tools/memory-model/scripts/newlitmushist.sh     |   61 +
 tools/memory-model/scripts/parseargs.sh         |  136 ++
 tools/memory-model/scripts/runlitmushist.sh     |   87 +
 tools/testing/selftests/x86/protection_keys.c   |   41 +-
 89 files changed, 7395 insertions(+), 2182 deletions(-)
 create mode 100644 Documentation/kdump/vmcoreinfo.txt
 create mode 100644 include/linux/atomic-fallback.h
 create mode 100755 scripts/atomic/atomic-tbl.sh
 create mode 100755 scripts/atomic/atomics.tbl
 create mode 100755 scripts/atomic/check-atomics.sh
 create mode 100755 scripts/atomic/fallbacks/acquire
 create mode 100755 scripts/atomic/fallbacks/add_negative
 create mode 100755 scripts/atomic/fallbacks/add_unless
 create mode 100755 scripts/atomic/fallbacks/andnot
 create mode 100755 scripts/atomic/fallbacks/dec
 create mode 100755 scripts/atomic/fallbacks/dec_and_test
 create mode 100755 scripts/atomic/fallbacks/dec_if_positive
 create mode 100755 scripts/atomic/fallbacks/dec_unless_positive
 create mode 100755 scripts/atomic/fallbacks/fence
 create mode 100755 scripts/atomic/fallbacks/fetch_add_unless
 create mode 100755 scripts/atomic/fallbacks/inc
 create mode 100755 scripts/atomic/fallbacks/inc_and_test
 create mode 100755 scripts/atomic/fallbacks/inc_not_zero
 create mode 100755 scripts/atomic/fallbacks/inc_unless_negative
 create mode 100755 scripts/atomic/fallbacks/read_acquire
 create mode 100755 scripts/atomic/fallbacks/release
 create mode 100755 scripts/atomic/fallbacks/set_release
 create mode 100755 scripts/atomic/fallbacks/sub_and_test
 create mode 100755 scripts/atomic/fallbacks/try_cmpxchg
 create mode 100755 scripts/atomic/gen-atomic-fallback.sh
 create mode 100755 scripts/atomic/gen-atomic-instrumented.sh
 create mode 100755 scripts/atomic/gen-atomic-long.sh
 create mode 100644 tools/memory-model/.gitignore
 create mode 100644 tools/memory-model/scripts/README
 create mode 100644 tools/memory-model/scripts/checkghlitmus.sh
 create mode 100644 tools/memory-model/scripts/checklitmushist.sh
 create mode 100644 tools/memory-model/scripts/cmplitmushist.sh
 create mode 100644 tools/memory-model/scripts/initlitmushist.sh
 create mode 100644 tools/memory-model/scripts/judgelitmus.sh
 create mode 100644 tools/memory-model/scripts/newlitmushist.sh
 create mode 100644 tools/memory-model/scripts/parseargs.sh
 create mode 100644 tools/memory-model/scripts/runlitmushist.sh
Merging clockevents/clockevents/next (bd2bcaa565a2 Merge branch 'clockevents/4.21' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core)
$ git merge clockevents/clockevents/next
Already up to date.
Merging edac-amd/for-next (75dfa87035f9 EDAC, fsl_ddr: Add LS1021A to the list of supported hardware)
$ git merge edac-amd/for-next
Already up to date.
Merging irqchip/irq/irqchip-next (8fa4e55bbfbf irqchip/madera: Drop GPIO includes)
$ git merge irqchip/irq/irqchip-next
Merge made by the 'recursive' strategy.
 drivers/irqchip/irq-gic-v3-mbi.c | 2 +-
 drivers/irqchip/irq-madera.c     | 2 --
 drivers/irqchip/irq-stm32-exti.c | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
Merging ftrace/for-next (3d739c1f6156 tracing: Use the return of str_has_prefix() to remove open coded numbers)
$ git merge ftrace/for-next
Already up to date.
Merging rcu/rcu/next (f25bcbbbf561 Merge LKMM and RCU commits)
$ git merge rcu/rcu/next
Auto-merging virt/kvm/kvm_main.c
Auto-merging MAINTAINERS
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 .../Expedited-Grace-Periods/ExpSchedFlow.svg       |  18 +-
 .../Expedited-Grace-Periods.html                   |  26 +-
 .../Memory-Ordering/Tree-RCU-Memory-Ordering.html  |   6 +-
 .../TreeRCU-callback-invocation.svg                |   2 +-
 .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg      |   8 +-
 .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg      |   6 +-
 .../RCU/Design/Requirements/Requirements.html      |  20 +-
 Documentation/RCU/stallwarn.txt                    |  15 +-
 Documentation/RCU/torture.txt                      | 169 +-----------
 Documentation/RCU/whatisRCU.txt                    |   4 +-
 Documentation/admin-guide/kernel-parameters.txt    |  32 ++-
 Documentation/memory-barriers.txt                  |   6 +-
 MAINTAINERS                                        |   6 +
 include/asm-generic/bug.h                          |   3 -
 include/linux/rcupdate.h                           |  74 +-----
 include/linux/srcu.h                               |   1 +
 include/linux/srcutree.h                           |   3 +-
 include/linux/torture.h                            |   3 +-
 kernel/locking/locktorture.c                       |   2 +-
 kernel/rcu/rcu.h                                   |   4 +-
 kernel/rcu/rcuperf.c                               |   8 +-
 kernel/rcu/rcutorture.c                            |  40 ++-
 kernel/rcu/srcutree.c                              |  55 ++--
 kernel/rcu/tiny.c                                  |   2 +-
 kernel/rcu/tree.c                                  | 248 +++++++++++-------
 kernel/rcu/tree.h                                  |  36 +--
 kernel/rcu/tree_exp.h                              | 184 +++++--------
 kernel/rcu/tree_plugin.h                           | 221 ++++------------
 kernel/sched/cpufreq.c                             |   4 +-
 kernel/sched/cpufreq_schedutil.c                   |   2 +-
 kernel/sched/sched.h                               |   2 +-
 kernel/sched/topology.c                            |   4 +-
 kernel/time/timer.c                                |   2 +-
 kernel/torture.c                                   |   6 +-
 .../rcutorture/bin => include/nolibc}/nolibc.h     | 118 +++++++--
 tools/memory-model/Documentation/explanation.txt   | 289 +++++++++++----------
 tools/memory-model/README                          |  25 +-
 tools/memory-model/linux-kernel.bell               |  35 ++-
 tools/memory-model/linux-kernel.cat                |  41 ++-
 tools/memory-model/linux-kernel.def                |   5 +
 tools/testing/selftests/rcutorture/bin/mkinitrd.sh |  27 +-
 virt/kvm/kvm_main.c                                |   2 +-
 42 files changed, 825 insertions(+), 939 deletions(-)
 rename tools/{testing/selftests/rcutorture/bin => include/nolibc}/nolibc.h (94%)
Merging kvm/linux-next (bfeffd155283 Linux 5.0-rc1)
$ git merge kvm/linux-next
Already up to date.
Merging kvm-arm/next (8c33df1afd86 arm: KVM: Add S2_PMD_{MASK,SIZE} constants)
$ git merge kvm-arm/next
Already up to date.
Merging kvm-ppc/kvm-ppc-next (ae59a7e1945b KVM: PPC: Book3S HV: Keep rc bits in shadow pgtable in sync with host)
$ git merge kvm-ppc/kvm-ppc-next
Already up to date.
Merging kvms390/next (7aedd9d48f2a KVM: s390: fix kmsg component kvm-s390)
$ git merge kvms390/next
Already up to date.
Merging xen-tip/linux-next (867cefb4cb10 xen: Fix x86 sched_clock() interface for xen)
$ git merge xen-tip/linux-next
Merge made by the 'recursive' strategy.
 arch/x86/xen/enlighten_pv.c      |   5 +-
 arch/x86/xen/time.c              |  12 +++--
 drivers/xen/events/events_base.c |   2 +-
 drivers/xen/pvcalls-back.c       |   9 ++--
 drivers/xen/pvcalls-front.c      | 104 ++++++++++++++++++++++++++++-----------
 5 files changed, 90 insertions(+), 42 deletions(-)
Merging percpu/for-next (718f6757a29b Merge branch 'for-4.21' into for-next)
$ git merge percpu/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
$ git merge workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (bfeffd155283 Linux 5.0-rc1)
$ git merge drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (bfeffd155283 Linux 5.0-rc1)
$ git merge chrome-platform/for-next
Already up to date.
Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro)
$ git merge hsi/for-next
Already up to date.
Merging leds/for-next (0f85e8498a48 leds: trigger: timer: Add initialization from Device Tree)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 .../ABI/testing/sysfs-class-led-trigger-pattern    | 51 +----------
 Documentation/devicetree/bindings/leds/common.txt  | 12 +++
 .../bindings/leds/leds-trigger-pattern.txt         | 49 +++++++++++
 drivers/leds/led-core.c                            | 30 +++++++
 drivers/leds/trigger/ledtrig-oneshot.c             | 38 ++++++++-
 drivers/leds/trigger/ledtrig-pattern.c             | 99 +++++++++++++++++-----
 drivers/leds/trigger/ledtrig-timer.c               | 34 ++++++++
 include/linux/leds.h                               | 13 +++
 8 files changed, 257 insertions(+), 69 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/leds/leds-trigger-pattern.txt
Merging ipmi/for-next (535c98b8c211 ipmi: msghandler: Fix potential Spectre v1 vulnerabilities)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 drivers/char/ipmi/ipmi_devintf.c    |   6 +-
 drivers/char/ipmi/ipmi_msghandler.c | 320 +++++++++++++++++++++++-------------
 drivers/char/ipmi/ipmi_si_intf.c    |   5 +-
 drivers/char/ipmi/ipmi_ssif.c       | 211 +++++++++++++++++-------
 drivers/char/ipmi/kcs_bmc.c         |   5 +-
 include/linux/ipmi_smi.h            |  27 ++-
 6 files changed, 386 insertions(+), 188 deletions(-)
Merging driver-core/driver-core-next (bdfe0df1e97b Merge 5.0-rc2 into driver-core-next)
$ git merge driver-core/driver-core-next
Merge made by the 'recursive' strategy.
 drivers/base/bus.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
Merging usb/usb-next (cb7edfd4cd47 Merge 5.0-rc2 into usb-next)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/core/config.c              |  5 +----
 drivers/usb/core/devio.c               |  8 +++-----
 drivers/usb/core/urb.c                 |  5 ++---
 drivers/usb/gadget/udc/snps_udc_core.c | 17 ++++++++---------
 drivers/usb/host/u132-hcd.c            |  6 ++++--
 5 files changed, 18 insertions(+), 23 deletions(-)
Merging usb-gadget/next (1c7fc5cbc339 Linux 5.0-rc2)
$ git merge usb-gadget/next
Already up to date.
Merging usb-serial/usb-next (bfeffd155283 Linux 5.0-rc1)
$ git merge usb-serial/usb-next
Already up to date.
Merging usb-chipidea-next/ci-for-usb-next (9049fce897ed usb: chipidea: imx: allow to configure oc polarity on i.MX25)
$ git merge usb-chipidea-next/ci-for-usb-next
Already up to date.
Merging phy-next/next (49ee1406355e phy: qcom-qusb2: Add QUSB2 PHY support for msm8998)
$ git merge phy-next/next
Auto-merging drivers/phy/ti/Kconfig
Merge made by the 'recursive' strategy.
 .../bindings/phy/phy-rockchip-inno-usb2.txt        |   2 +
 .../devicetree/bindings/phy/qcom-qmp-phy.txt       |   5 +
 .../devicetree/bindings/phy/qcom-qusb2-phy.txt     |   1 +
 .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt |   2 +
 Documentation/devicetree/bindings/phy/ti-phy.txt   |   1 +
 drivers/phy/freescale/Kconfig                      |   2 +-
 drivers/phy/qualcomm/phy-qcom-qmp.c                | 140 +++++++++++++++++++++
 drivers/phy/qualcomm/phy-qcom-qmp.h                |   4 +
 drivers/phy/qualcomm/phy-qcom-qusb2.c              |  40 ++++++
 drivers/phy/qualcomm/phy-qcom-ufs-i.h              |  19 +--
 drivers/phy/rockchip/phy-rockchip-inno-usb2.c      |  48 +++----
 drivers/phy/ti/Kconfig                             |   6 +-
 drivers/phy/ti/phy-omap-usb2.c                     | 105 ++++++++++------
 13 files changed, 283 insertions(+), 92 deletions(-)
Merging tty/tty-next (defe3b6d7010 Merge 5.0-rc2 into tty-next)
$ git merge tty/tty-next
Merge made by the 'recursive' strategy.
 drivers/tty/serial/clps711x.c         |  23 +--
 drivers/tty/serial/max310x.c          |   7 +-
 drivers/tty/serial/qcom_geni_serial.c | 279 +++++++++++++---------------------
 drivers/tty/serial/sc16is7xx.c        |   4 +-
 drivers/tty/serial/sh-sci.c           |  71 +++++----
 5 files changed, 158 insertions(+), 226 deletions(-)
Merging char-misc/char-misc-next (4ad84cb56b00 mei: squash single_recv_buf into one bit in client properties)
$ git merge char-misc/char-misc-next
Auto-merging lib/Kconfig.debug
Merge made by the 'recursive' strategy.
 drivers/misc/lkdtm/core.c  | 11 ++---------
 drivers/misc/lkdtm/lkdtm.h |  2 ++
 drivers/misc/lkdtm/perms.c | 36 +++++++++++++++++++++++++++---------
 drivers/misc/mei/hw.h      |  3 ++-
 lib/Kconfig.debug          |  1 -
 5 files changed, 33 insertions(+), 20 deletions(-)
Merging extcon/extcon-next (bfeffd155283 Linux 5.0-rc1)
$ git merge extcon/extcon-next
Already up to date.
Merging soundwire/next (bfeffd155283 Linux 5.0-rc1)
$ git merge soundwire/next
Already up to date.
Merging thunderbolt/next (bfeffd155283 Linux 5.0-rc1)
$ git merge thunderbolt/next
Already up to date.
Merging staging/staging-next (90c5f2d29fc9 Merge 5.0-rc2 into staging-next)
$ git merge staging/staging-next
Auto-merging drivers/staging/wilc1000/host_interface.c
Merge made by the 'recursive' strategy.
 drivers/staging/Kconfig                            |   2 +
 drivers/staging/Makefile                           |   1 +
 drivers/staging/comedi/drivers/cb_pcimdas.c        |   6 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |   2 +-
 drivers/staging/erofs/data.c                       |   6 -
 drivers/staging/erofs/internal.h                   |   9 +-
 drivers/staging/erofs/unzip_vle.c                  |   2 +-
 drivers/staging/erofs/unzip_vle_lz4.c              |   2 +-
 drivers/staging/erofs/utils.c                      |  14 +-
 drivers/staging/erofs/xattr.c                      |  10 +-
 drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h         |   2 +-
 drivers/staging/fsl-dpaa2/ethsw/dpsw.h             |   2 +-
 drivers/staging/fsl-dpaa2/ethsw/ethsw.h            |   2 +-
 drivers/staging/mt7621-dma/ralink-gdma.c           |   6 +-
 drivers/staging/mt7621-dts/gbpc1.dts               |   4 +-
 drivers/staging/mt7621-dts/mt7621.dtsi             |  55 ++-
 drivers/staging/mt7621-pci-phy/Kconfig             |   7 +
 drivers/staging/mt7621-pci-phy/Makefile            |   1 +
 drivers/staging/mt7621-pci-phy/TODO                |   4 +
 .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt     |  54 +++
 drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c    | 387 +++++++++++++++++++++
 drivers/staging/mt7621-pci/pci-mt7621.c            | 250 ++-----------
 drivers/staging/mt7621-pinctrl/Kconfig             |   1 +
 drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c    |  41 +--
 drivers/staging/rtl8192e/dot11d.c                  |   8 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |   6 +-
 drivers/staging/rts5208/ms.c                       |   5 +-
 drivers/staging/rts5208/sd.c                       |   7 +-
 drivers/staging/speakup/Kconfig                    |  32 +-
 drivers/staging/wilc1000/host_interface.c          |   2 +-
 drivers/staging/wlan-ng/prism2fw.c                 |   5 +-
 31 files changed, 605 insertions(+), 330 deletions(-)
 create mode 100644 drivers/staging/mt7621-pci-phy/Kconfig
 create mode 100644 drivers/staging/mt7621-pci-phy/Makefile
 create mode 100644 drivers/staging/mt7621-pci-phy/TODO
 create mode 100644 drivers/staging/mt7621-pci-phy/mediatek,mt7621-pci-phy.txt
 create mode 100644 drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c
Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
$ git merge mux/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Merging icc/icc-next (714e53a78f6f interconnect: Revert to previous config if any request fails)
$ git merge icc/icc-next
Auto-merging drivers/Makefile
Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/interconnect/interconnect.txt         |  60 ++
 .../bindings/interconnect/qcom,sdm845.txt          |  24 +
 Documentation/interconnect/interconnect.rst        |  94 +++
 MAINTAINERS                                        |  10 +
 arch/arm64/boot/dts/qcom/sdm845.dtsi               |   6 +
 drivers/Kconfig                                    |   2 +
 drivers/Makefile                                   |   1 +
 drivers/interconnect/Kconfig                       |  15 +
 drivers/interconnect/Makefile                      |   6 +
 drivers/interconnect/core.c                        | 799 ++++++++++++++++++++
 drivers/interconnect/qcom/Kconfig                  |  13 +
 drivers/interconnect/qcom/Makefile                 |   5 +
 drivers/interconnect/qcom/sdm845.c                 | 838 +++++++++++++++++++++
 include/dt-bindings/interconnect/qcom,sdm845.h     | 143 ++++
 include/linux/interconnect-provider.h              | 142 ++++
 include/linux/interconnect.h                       |  59 ++
 16 files changed, 2217 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt
 create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt
 create mode 100644 Documentation/interconnect/interconnect.rst
 create mode 100644 drivers/interconnect/Kconfig
 create mode 100644 drivers/interconnect/Makefile
 create mode 100644 drivers/interconnect/core.c
 create mode 100644 drivers/interconnect/qcom/Kconfig
 create mode 100644 drivers/interconnect/qcom/Makefile
 create mode 100644 drivers/interconnect/qcom/sdm845.c
 create mode 100644 include/dt-bindings/interconnect/qcom,sdm845.h
 create mode 100644 include/linux/interconnect-provider.h
 create mode 100644 include/linux/interconnect.h
Merging slave-dma/next (8160320bd8eb Merge branch 'topic/imx' into next)
$ git merge slave-dma/next
Auto-merging drivers/dma/xilinx/xilinx_dma.c
Auto-merging drivers/dma/imx-sdma.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/dma/snps-dma.txt |   2 -
 .../devicetree/bindings/dma/xilinx/xilinx_dma.txt  |   7 +-
 drivers/dma/at_hdmac.c                             |   5 -
 drivers/dma/bcm2835-dma.c                          |   3 +-
 drivers/dma/dma-jz4780.c                           |   5 +-
 drivers/dma/dw-axi-dmac/dw-axi-dmac.h              |   2 +-
 drivers/dma/dw/Kconfig                             |   2 +
 drivers/dma/dw/Makefile                            |   2 +-
 drivers/dma/dw/core.c                              | 245 ++++-----------------
 drivers/dma/dw/dw.c                                | 138 ++++++++++++
 drivers/dma/dw/idma32.c                            | 160 ++++++++++++++
 drivers/dma/dw/internal.h                          |  15 +-
 drivers/dma/dw/pci.c                               |  53 +++--
 drivers/dma/dw/platform.c                          |  22 +-
 drivers/dma/dw/regs.h                              |  30 ++-
 drivers/dma/imx-sdma.c                             |   7 +
 drivers/dma/mv_xor.c                               |   5 +-
 drivers/dma/pl330.c                                |   1 -
 drivers/dma/qcom/bam_dma.c                         |   4 +-
 drivers/dma/qcom/hidma_mgmt.c                      |   3 +-
 drivers/dma/sa11x0-dma.c                           |   2 -
 drivers/dma/st_fdma.c                              |   6 +-
 drivers/dma/stm32-dma.c                            |  71 +++++-
 drivers/dma/stm32-dmamux.c                         |  58 ++++-
 drivers/dma/stm32-mdma.c                           |  56 ++++-
 drivers/dma/tegra20-apb-dma.c                      |  45 ++--
 drivers/dma/xilinx/xilinx_dma.c                    | 166 ++++++++------
 drivers/tty/serial/8250/8250_lpss.c                |   1 -
 include/linux/dma/dw.h                             |   9 +-
 include/linux/platform_data/dma-dw.h               |  12 +-
 include/trace/events/tegra_apb_dma.h               |  61 +++++
 31 files changed, 792 insertions(+), 406 deletions(-)
 create mode 100644 drivers/dma/dw/dw.c
 create mode 100644 drivers/dma/dw/idma32.c
 create mode 100644 include/trace/events/tegra_apb_dma.h
Merging cgroup/for-next (0623413ee0ba Merge branch 'for-4.21' into for-next)
$ git merge cgroup/for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging scsi/for-next (6de89c8b7dbe Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
CONFLICT (content): Merge conflict in drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c
CONFLICT (content): Merge conflict in drivers/scsi/arcmsr/arcmsr_hba.c
Resolved 'drivers/scsi/arcmsr/arcmsr_hba.c' using previous resolution.
Resolved 'drivers/scsi/hisi_sas/hisi_sas_v3_hw.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 14d1524d3d1c] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
 drivers/scsi/Kconfig                   |    2 +-
 drivers/scsi/arcmsr/arcmsr.h           |   13 +-
 drivers/scsi/arcmsr/arcmsr_hba.c       |  332 ++++++---
 drivers/scsi/bnx2i/bnx2i_iscsi.c       |    2 +-
 drivers/scsi/gdth.c                    | 1286 +++++---------------------------
 drivers/scsi/gdth.h                    |   30 -
 drivers/scsi/gdth_ioctl.h              |   89 ---
 drivers/scsi/gdth_proc.c               |  113 +--
 drivers/scsi/gdth_proc.h               |    3 -
 drivers/scsi/hisi_sas/hisi_sas.h       |   47 +-
 drivers/scsi/hisi_sas/hisi_sas_main.c  |  508 +++++++++++++
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c |    9 +-
 drivers/scsi/hisi_sas/hisi_sas_v3_hw.c |  174 ++++-
 drivers/scsi/sd.c                      |   62 ++
 drivers/scsi/sd.h                      |   62 --
 15 files changed, 1237 insertions(+), 1495 deletions(-)
Merging scsi-mkp/for-next (326a859b2814 scsi: ufs: Remove select of phy-qcom-ufs from ufs-qcom)
$ git merge scsi-mkp/for-next
Auto-merging drivers/scsi/qla4xxx/ql4_os.c
Auto-merging drivers/scsi/qla2xxx/qla_os.c
Auto-merging drivers/scsi/qla2xxx/qla_isr.c
Auto-merging drivers/scsi/qla2xxx/qla_def.h
Auto-merging drivers/scsi/qla2xxx/qla_attr.c
Merge made by the 'recursive' strategy.
 drivers/scsi/Kconfig               |   2 -
 drivers/scsi/libsas/sas_expander.c |  29 +++-
 drivers/scsi/qla2xxx/qla_attr.c    |  21 ++-
 drivers/scsi/qla2xxx/qla_def.h     |  28 ++++
 drivers/scsi/qla2xxx/qla_gbl.h     |   3 +-
 drivers/scsi/qla2xxx/qla_iocb.c    | 335 ++++++++++++++++++++++++++++++-------
 drivers/scsi/qla2xxx/qla_isr.c     |  11 ++
 drivers/scsi/qla2xxx/qla_os.c      | 205 +++++++++++++++++++++--
 drivers/scsi/qla2xxx/qla_target.c  |   2 +-
 drivers/scsi/qla2xxx/qla_target.h  |   2 +
 drivers/scsi/ufs/Kconfig           |   1 -
 include/scsi/libsas.h              |  56 +++----
 12 files changed, 586 insertions(+), 109 deletions(-)
Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
$ git merge target-updates/for-next
Already up to date.
Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
$ git merge target-bva/for-next
Already up to date.
Merging vhost/linux-next (b03f1d919455 virtio_balloon: remove the unnecessary 0-initialization)
$ git merge vhost/linux-next
Auto-merging include/linux/compiler.h
CONFLICT (content): Merge conflict in include/linux/compiler.h
Auto-merging Documentation/memory-barriers.txt
Resolved 'include/linux/compiler.h' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7e642c02ba58] Merge remote-tracking branch 'vhost/linux-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/memory-barriers.txt      |  20 +++++++
 arch/alpha/include/asm/barrier.h       |   1 +
 drivers/misc/mic/vop/vop_main.c        |   9 ++-
 drivers/net/virtio_net.c               |  29 ++++++---
 drivers/pci/setup-bus.c                |  10 ++++
 drivers/remoteproc/remoteproc_virtio.c |   9 ++-
 drivers/s390/virtio/virtio_ccw.c       |  12 +++-
 drivers/vhost/scsi.c                   |  20 ++++---
 drivers/vhost/vhost.c                  |   8 ++-
 drivers/virtio/virtio_balloon.c        | 104 ++++++++++++++++++++++-----------
 drivers/virtio/virtio_mmio.c           |   9 ++-
 drivers/virtio/virtio_pci_common.c     |   8 +--
 drivers/virtio/virtio_ring.c           |  13 +++--
 include/asm-generic/barrier.h          |  18 ++++++
 include/linux/compiler.h               |   6 +-
 include/linux/virtio_config.h          |  13 +++--
 16 files changed, 213 insertions(+), 76 deletions(-)
Merging rpmsg/for-next (e9856d7eb6e4 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Auto-merging Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/remoteproc/qcom,adsp.txt   |  6 ++
 .../devicetree/bindings/remoteproc/qcom,q6v5.txt   | 64 +++++++++++++++++++++-
 .../devicetree/bindings/soc/qcom/qcom,glink.txt    |  5 ++
 drivers/remoteproc/qcom_q6v5_mss.c                 | 12 +++-
 drivers/remoteproc/qcom_wcnss.c                    |  2 +-
 drivers/remoteproc/remoteproc_debugfs.c            | 26 +++++++++
 drivers/rpmsg/rpmsg_core.c                         |  3 +-
 include/linux/remoteproc.h                         |  4 +-
 8 files changed, 114 insertions(+), 8 deletions(-)
Merging gpio/for-next (08589fe40380 Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 drivers/gpio/gpio-mvebu.c         | 11 +++++++++++
 drivers/gpio/gpio-sama5d2-piobu.c | 20 ++++++++------------
 drivers/gpio/gpiolib-acpi.c       |  5 ++++-
 3 files changed, 23 insertions(+), 13 deletions(-)
Merging gpio-brgl/gpio/for-next (0bfb75115506 Documentation: gpio: driver: fix wire name for I2C)
$ git merge gpio-brgl/gpio/for-next
Auto-merging drivers/gpio/gpio-pca953x.c
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/gpio/gpio-pca953x.txt | 1 +
 Documentation/driver-api/gpio/driver.rst                | 2 +-
 drivers/gpio/gpio-madera.c                              | 2 +-
 drivers/gpio/gpio-pca953x.c                             | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
Merging pinctrl/for-next (489d4832bfba Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
 .../pinctrl/marvell,armada-37xx-pinctrl.txt        |  24 +-
 drivers/pinctrl/freescale/Kconfig                  |   7 +
 drivers/pinctrl/freescale/Makefile                 |   1 +
 drivers/pinctrl/freescale/pinctrl-imx8qm.c         | 326 +++++++++++++++++++++
 drivers/pinctrl/mediatek/Kconfig                   |   3 +
 drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c   |   8 +-
 drivers/pinctrl/mvebu/pinctrl-armada-37xx.c        |  11 +-
 drivers/pinctrl/pinctrl-amd.c                      |   2 +-
 drivers/pinctrl/pinctrl-mcp23s08.c                 |   3 +-
 drivers/pinctrl/sirf/pinctrl-atlas7.c              |   4 +-
 10 files changed, 373 insertions(+), 16 deletions(-)
 create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qm.c
Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
$ git merge pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (7ca17b207127 pwm: imx: Signedness bug in imx_pwm_get_state())
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 drivers/pwm/Kconfig                    |  17 ++-
 drivers/pwm/Makefile                   |   3 +-
 drivers/pwm/core.c                     |  10 +-
 drivers/pwm/pwm-imx1.c                 | 199 ++++++++++++++++++++++++++++++
 drivers/pwm/{pwm-imx.c => pwm-imx27.c} | 217 +++++++++------------------------
 include/linux/pwm.h                    |  37 +++---
 6 files changed, 293 insertions(+), 190 deletions(-)
 create mode 100644 drivers/pwm/pwm-imx1.c
 rename drivers/pwm/{pwm-imx.c => pwm-imx27.c} (59%)
Merging userns/for-next (ee17e5d6201c signal: Make siginmask safe when passed a signal of 0)
$ git merge userns/for-next
Merge made by the 'recursive' strategy.
 include/linux/signal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
$ git merge ktest/for-next
Already up to date.
Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
$ git merge random/dev
Auto-merging drivers/char/random.c
Merge made by the 'recursive' strategy.
 drivers/char/random.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
Merging kselftest/next (bfeffd155283 Linux 5.0-rc1)
$ git merge kselftest/next
Already up to date.
Merging y2038/y2038 (e4b92b108c6c timekeeping: remove obsolete time accessors)
$ git merge y2038/y2038
Already up to date.
Merging livepatching/for-next (e1fd0398d1e7 Merge branch 'for-5.1/fake-signal' into for-next)
$ git merge livepatching/for-next
Auto-merging lib/Kconfig.debug
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-kernel-livepatch   |  12 -
 Documentation/livepatch/callbacks.txt              | 489 +-----------
 Documentation/livepatch/cumulative-patches.txt     | 102 +++
 Documentation/livepatch/livepatch.txt              | 182 +++--
 MAINTAINERS                                        |   1 +
 include/linux/livepatch.h                          |  50 +-
 kernel/livepatch/core.c                            | 822 +++++++++++++--------
 kernel/livepatch/core.h                            |   5 +
 kernel/livepatch/patch.c                           |  57 +-
 kernel/livepatch/patch.h                           |   5 +-
 kernel/livepatch/transition.c                      | 124 ++--
 kernel/livepatch/transition.h                      |   1 -
 lib/Kconfig.debug                                  |  22 +-
 lib/Makefile                                       |   2 +
 lib/livepatch/Makefile                             |  15 +
 lib/livepatch/test_klp_atomic_replace.c            |  57 ++
 lib/livepatch/test_klp_callbacks_busy.c            |  43 ++
 lib/livepatch/test_klp_callbacks_demo.c            | 121 +++
 lib/livepatch/test_klp_callbacks_demo2.c           |  93 +++
 lib/livepatch/test_klp_callbacks_mod.c             |  24 +
 lib/livepatch/test_klp_livepatch.c                 |  51 ++
 lib/livepatch/test_klp_shadow_vars.c               | 236 ++++++
 samples/livepatch/livepatch-callbacks-demo.c       |  13 +-
 samples/livepatch/livepatch-sample.c               |  13 +-
 samples/livepatch/livepatch-shadow-fix1.c          |  14 +-
 samples/livepatch/livepatch-shadow-fix2.c          |  14 +-
 tools/testing/selftests/Makefile                   |   1 +
 tools/testing/selftests/livepatch/Makefile         |   8 +
 tools/testing/selftests/livepatch/README           |  43 ++
 tools/testing/selftests/livepatch/config           |   1 +
 tools/testing/selftests/livepatch/functions.sh     | 203 +++++
 .../testing/selftests/livepatch/test-callbacks.sh  | 587 +++++++++++++++
 .../testing/selftests/livepatch/test-livepatch.sh  | 168 +++++
 .../selftests/livepatch/test-shadow-vars.sh        |  60 ++
 34 files changed, 2603 insertions(+), 1036 deletions(-)
 create mode 100644 Documentation/livepatch/cumulative-patches.txt
 create mode 100644 lib/livepatch/Makefile
 create mode 100644 lib/livepatch/test_klp_atomic_replace.c
 create mode 100644 lib/livepatch/test_klp_callbacks_busy.c
 create mode 100644 lib/livepatch/test_klp_callbacks_demo.c
 create mode 100644 lib/livepatch/test_klp_callbacks_demo2.c
 create mode 100644 lib/livepatch/test_klp_callbacks_mod.c
 create mode 100644 lib/livepatch/test_klp_livepatch.c
 create mode 100644 lib/livepatch/test_klp_shadow_vars.c
 create mode 100644 tools/testing/selftests/livepatch/Makefile
 create mode 100644 tools/testing/selftests/livepatch/README
 create mode 100644 tools/testing/selftests/livepatch/config
 create mode 100644 tools/testing/selftests/livepatch/functions.sh
 create mode 100755 tools/testing/selftests/livepatch/test-callbacks.sh
 create mode 100755 tools/testing/selftests/livepatch/test-livepatch.sh
 create mode 100755 tools/testing/selftests/livepatch/test-shadow-vars.sh
Merging coresight/next (675e806209e0 coresight: Use of_node_name_eq for node name comparisons)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight-cpu-debug.c |  4 ++++
 drivers/hwtracing/coresight/coresight-stm.c       | 12 ++++--------
 drivers/hwtracing/coresight/of_coresight.c        |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
Merging rtc/rtc-next (c8c97a4fb52c rtc: isl1208: fix negative digital trim reporting)
$ git merge rtc/rtc-next
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/rtc/rtc.txt      |   2 +
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 MAINTAINERS                                        |   6 +
 drivers/rtc/Kconfig                                |   9 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/lib.c                                  |   6 +-
 drivers/rtc/rtc-isl1208.c                          |   9 +-
 drivers/rtc/rtc-pcf8523.c                          |   1 +
 drivers/rtc/rtc-sd3078.c                           | 232 +++++++++++++++++++++
 9 files changed, 260 insertions(+), 7 deletions(-)
 create mode 100644 drivers/rtc/rtc-sd3078.c
Merging nvdimm/libnvdimm-for-next (8a6f7591ddf5 Merge branch 'for-5.0/dax' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Already up to date!
Merge made by the 'recursive' strategy.
Merging at24/at24/for-next (3b0548784079 eeprom: at24: remove at24_platform_data)
$ git merge at24/at24/for-next
Removing include/linux/platform_data/at24.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                |   1 -
 arch/arm/mach-davinci/board-da830-evm.c    |  13 +--
 arch/arm/mach-davinci/board-da850-evm.c    |  28 -----
 arch/arm/mach-davinci/board-dm365-evm.c    |  13 +--
 arch/arm/mach-davinci/board-dm644x-evm.c   |  13 +--
 arch/arm/mach-davinci/board-dm646x-evm.c   |  13 +--
 arch/arm/mach-davinci/board-mityomapl138.c |  38 ++++---
 arch/arm/mach-davinci/board-sffsdr.c       |  13 ++-
 arch/arm/mach-davinci/common.c             |  15 ---
 drivers/misc/eeprom/at24.c                 | 162 +++++++++++++----------------
 include/linux/davinci_emac.h               |   1 -
 include/linux/platform_data/at24.h         |  60 -----------
 12 files changed, 122 insertions(+), 248 deletions(-)
 delete mode 100644 include/linux/platform_data/at24.h
Merging ntb/ntb-next (d9842b39e9ec ntb_hw_switchtec: Added support of >=4G memory windows)
$ git merge ntb/ntb-next
Auto-merging include/linux/switchtec.h
Auto-merging drivers/ntb/hw/mscc/ntb_hw_switchtec.c
Merge made by the 'recursive' strategy.
 drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 11 ++++++++---
 include/linux/switchtec.h              | 10 +++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)
Merging kspp/for-next/kspp (be1944712d8e Merge branch 'for-next/gcc-plugin/arm-stackprotector' into for-next/kspp)
$ git merge kspp/for-next/kspp
Already up to date!
Merge made by the 'recursive' strategy.
Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
$ git merge init_task/init_task
Already up to date.
Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next)
$ git merge cisco/for-next
Auto-merging init/Kconfig
Auto-merging arch/x86/kernel/setup.c
CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
Auto-merging arch/x86/Kconfig
Auto-merging arch/powerpc/kernel/prom.c
Auto-merging arch/powerpc/Kconfig
Resolved 'arch/x86/kernel/setup.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 0365f9324876] Merge remote-tracking branch 'cisco/for-next'
$ git diff -M --stat --summary HEAD^..
 arch/powerpc/Kconfig                          | 23 +--------
 arch/powerpc/configs/44x/fsp2_defconfig       | 29 ++++++-----
 arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++-----
 arch/powerpc/configs/44x/warp_defconfig       | 12 ++---
 arch/powerpc/configs/holly_defconfig          | 12 ++---
 arch/powerpc/configs/mvme5100_defconfig       | 25 +++++-----
 arch/powerpc/configs/skiroot_defconfig        | 48 +++++++++---------
 arch/powerpc/configs/storcenter_defconfig     | 15 +++---
 arch/powerpc/kernel/prom.c                    |  4 ++
 arch/powerpc/kernel/prom_init.c               |  8 +--
 arch/powerpc/kernel/prom_init_check.sh        |  2 +-
 arch/x86/Kconfig                              | 44 +---------------
 arch/x86/kernel/setup.c                       | 19 ++-----
 include/linux/cmdline.h                       | 72 +++++++++++++++++++++++++++
 init/Kconfig                                  | 69 +++++++++++++++++++++++++
 15 files changed, 235 insertions(+), 171 deletions(-)
 create mode 100644 include/linux/cmdline.h
Merging gnss/gnss-next (bfeffd155283 Linux 5.0-rc1)
$ git merge gnss/gnss-next
Already up to date.
Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
$ git merge fsi/master
Already up to date.
Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
$ git merge siox/siox/next
Already up to date.
Merging slimbus/for-next (81648d8bc222 slimbus: core: add missing spin_lock_init on txn_lock)
$ git merge slimbus/for-next
Merge made by the 'recursive' strategy.
 drivers/slimbus/core.c | 45 +++++++++++++++++++++++++--------------------
 1 file changed, 25 insertions(+), 20 deletions(-)
Merging nvmem/for-next (ff3b9b5c6b1b nvmem: core: Avoid useless iterations in nvmem_cell_get_from_lookup())
$ git merge nvmem/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/nvmem/imx-ocotp.txt        |  4 ++-
 drivers/nvmem/bcm-ocotp.c                          | 37 +++++++++++----------
 drivers/nvmem/core.c                               | 38 +++++++++++++---------
 drivers/nvmem/imx-ocotp.c                          | 13 ++++++++
 drivers/nvmem/sc27xx-efuse.c                       | 12 ++++---
 5 files changed, 66 insertions(+), 38 deletions(-)
Merging xarray/xarray (edcddd4c879a XArray: Fix an arithmetic error in xa_is_err)
$ git merge xarray/xarray
Merge made by the 'recursive' strategy.
 Documentation/core-api/xarray.rst |  15 ++-
 include/linux/xarray.h            | 227 ++++++++++++++++++++++++++++----------
 lib/test_xarray.c                 |  57 ++++++++--
 lib/xarray.c                      |  92 ++++++++-------
 4 files changed, 278 insertions(+), 113 deletions(-)
Merging hyperv/hyperv-next (651022382c7f Linux 4.20-rc1)
$ git merge hyperv/hyperv-next
Already up to date.
Merging auxdisplay/auxdisplay (bfeffd155283 Linux 5.0-rc1)
$ git merge auxdisplay/auxdisplay
Already up to date.
Merging kgdb-dt/kgdb/for-next (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops)
$ git merge kgdb-dt/kgdb/for-next
Auto-merging arch/sh/kernel/kgdb.c
Merge made by the 'recursive' strategy.
Merging pidfd/for-next (4607de57fff5 selftests: add tests for pidfd_send_signal())
$ git merge pidfd/for-next
Auto-merging tools/testing/selftests/Makefile
Auto-merging fs/proc/base.c
Merge made by the 'recursive' strategy.
 arch/x86/entry/syscalls/syscall_32.tbl     |   1 +
 arch/x86/entry/syscalls/syscall_64.tbl     |   1 +
 fs/proc/base.c                             |   9 +
 include/linux/proc_fs.h                    |   6 +
 include/linux/syscalls.h                   |   3 +
 include/uapi/asm-generic/unistd.h          |   4 +-
 kernel/signal.c                            | 133 +++++++++-
 kernel/sys_ni.c                            |   1 +
 tools/testing/selftests/Makefile           |   1 +
 tools/testing/selftests/pidfd/Makefile     |   6 +
 tools/testing/selftests/pidfd/pidfd_test.c | 381 +++++++++++++++++++++++++++++
 11 files changed, 539 insertions(+), 7 deletions(-)
 create mode 100644 tools/testing/selftests/pidfd/Makefile
 create mode 100644 tools/testing/selftests/pidfd/pidfd_test.c
$ git am -3 ../patches/0001-Revert-drm-imx-Allow-building-under-COMPILE_TEST.patch
Applying: Revert "drm/imx: Allow building under COMPILE_TEST"
Merging akpm-current/current (f531bf6f8e5e ipc: conserve sequence numbers in extended IPCMNI mode)
$ git merge --no-ff akpm-current/current
Auto-merging security/selinux/ss/services.c
CONFLICT (content): Merge conflict in security/selinux/ss/services.c
Auto-merging security/selinux/ss/policydb.c
Auto-merging mm/rmap.c
CONFLICT (content): Merge conflict in mm/rmap.c
Removing lib/flex_array.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/signal.c
Auto-merging kernel/exit.c
Auto-merging include/linux/sched.h
Removing include/linux/flex_array.h
Auto-merging fs/proc/internal.h
Auto-merging fs/proc/base.c
Auto-merging fs/fuse/inode.c
Auto-merging fs/btrfs/disk-io.c
Auto-merging fs/afs/super.c
Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Auto-merging drivers/infiniband/hw/hfi1/init.c
Auto-merging drivers/hv/hv_balloon.c
Auto-merging drivers/block/mtip32xx/mtip32xx.c
Auto-merging block/blk-core.c
Removing Documentation/flexible-arrays.txt
Removing Documentation/core-api/flexible-arrays.rst
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Resolved 'mm/rmap.c' using previous resolution.
Resolved 'security/selinux/ss/services.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 02bf9bc148ee] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 Documentation/admin-guide/kernel-parameters.txt    |    3 +
 Documentation/admin-guide/mm/pagemap.rst           |    9 +-
 Documentation/core-api/flexible-arrays.rst         |  130 ---
 Documentation/core-api/genalloc.rst                |    2 +-
 Documentation/core-api/generic-radix-tree.rst      |   12 +
 Documentation/core-api/index.rst                   |    1 +
 Documentation/filesystems/proc.txt                 |    7 +-
 Documentation/flexible-arrays.txt                  |  123 ---
 arch/alpha/include/asm/topology.h                  |    3 +-
 arch/arm/mm/dma-mapping.c                          |    2 +-
 arch/arm/mm/mmu.c                                  |   13 +-
 arch/arm64/Kconfig                                 |    4 +
 arch/arm64/include/asm/hugetlb.h                   |    5 +
 arch/arm64/mm/hugetlbpage.c                        |   20 +
 arch/c6x/include/asm/Kbuild                        |    1 +
 arch/c6x/include/uapi/asm/Kbuild                   |    1 -
 arch/c6x/mm/dma-coherent.c                         |    9 +-
 arch/h8300/include/asm/Kbuild                      |    1 +
 arch/h8300/include/uapi/asm/Kbuild                 |    1 -
 arch/hexagon/include/asm/Kbuild                    |    1 +
 arch/hexagon/include/uapi/asm/Kbuild               |    1 -
 arch/ia64/kernel/numa.c                            |    2 +-
 arch/ia64/mm/discontig.c                           |    6 +-
 arch/m68k/include/asm/Kbuild                       |    1 +
 arch/m68k/include/uapi/asm/Kbuild                  |    1 -
 arch/microblaze/include/asm/Kbuild                 |    1 +
 arch/microblaze/include/uapi/asm/Kbuild            |    1 -
 arch/microblaze/mm/init.c                          |    5 +-
 arch/nds32/mm/init.c                               |   12 +-
 arch/openrisc/include/asm/Kbuild                   |    1 +
 arch/openrisc/include/uapi/asm/Kbuild              |    1 -
 arch/openrisc/mm/ioremap.c                         |   11 +-
 arch/powerpc/include/asm/pci-bridge.h              |    3 +-
 arch/powerpc/kernel/paca.c                         |   19 +-
 arch/powerpc/kernel/pci-common.c                   |    3 +-
 arch/powerpc/kernel/setup-common.c                 |    4 +-
 arch/powerpc/kernel/setup_64.c                     |   24 +-
 arch/powerpc/mm/hash_utils_64.c                    |    6 +-
 arch/powerpc/mm/numa.c                             |   14 +-
 arch/powerpc/mm/pgtable-book3e.c                   |    8 +-
 arch/powerpc/mm/pgtable-book3s64.c                 |    5 +-
 arch/powerpc/mm/pgtable-radix.c                    |   25 +-
 arch/powerpc/mm/ppc_mmu_32.c                       |    3 +-
 arch/powerpc/platforms/pasemi/iommu.c              |    5 +-
 arch/powerpc/platforms/powernv/memtrace.c          |    5 +-
 arch/powerpc/platforms/powernv/opal.c              |    3 +-
 arch/powerpc/platforms/pseries/setup.c             |   18 +-
 arch/powerpc/sysdev/dart_iommu.c                   |    7 +-
 arch/s390/numa/numa.c                              |   14 +-
 arch/sh/kernel/syscalls/syscalltbl.sh              |    4 +-
 arch/sh/kernel/syscalls_32.S                       |    2 +-
 arch/sh/mm/init.c                                  |   18 +-
 arch/sh/mm/numa.c                                  |    5 +-
 arch/sparc/include/asm/pgtable_64.h                |   30 -
 arch/sparc/kernel/pci_fire.c                       |    3 +-
 arch/sparc/kernel/pci_schizo.c                     |    3 +-
 arch/sparc/kernel/prom_64.c                        |    7 +-
 arch/sparc/kernel/psycho_common.c                  |    3 +-
 arch/sparc/kernel/sbus.c                           |    3 +-
 arch/sparc/mm/init_64.c                            |   15 +-
 arch/unicore32/include/asm/Kbuild                  |    1 +
 arch/unicore32/include/uapi/asm/Kbuild             |    1 -
 arch/unicore32/mm/mmu.c                            |   14 +-
 arch/x86/include/asm/pci.h                         |    3 +-
 arch/x86/kernel/apic/x2apic_uv_x.c                 |    7 +-
 arch/x86/kernel/smpboot.c                          |    3 +-
 arch/x86/mm/fault.c                                |    2 +-
 block/blk-core.c                                   |    3 +-
 drivers/block/mtip32xx/mtip32xx.c                  |    5 +-
 drivers/dma/dmaengine.c                            |    4 +-
 drivers/hv/hv_balloon.c                            |   20 +-
 drivers/infiniband/hw/hfi1/affinity.c              |    3 +-
 drivers/infiniband/hw/hfi1/init.c                  |    3 +-
 drivers/iommu/dmar.c                               |    5 +-
 drivers/iommu/intel-iommu.c                        |    3 +-
 drivers/md/raid5-ppl.c                             |    6 +-
 drivers/md/raid5.c                                 |   87 +-
 drivers/md/raid5.h                                 |    9 +-
 drivers/misc/sgi-xp/xpc_uv.c                       |    3 +-
 drivers/misc/sram-exec.c                           |    2 +-
 drivers/misc/vmw_balloon.c                         |   32 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |    5 +-
 drivers/xen/balloon.c                              |   24 +-
 fs/9p/vfs_super.c                                  |    2 +-
 fs/afs/super.c                                     |    2 +-
 fs/btrfs/disk-io.c                                 |    2 +-
 fs/buffer.c                                        |   56 +-
 fs/dax.c                                           |    7 +
 fs/eventpoll.c                                     |  173 +++-
 fs/file.c                                          |    1 +
 fs/fuse/inode.c                                    |    2 +-
 fs/ocfs2/aops.c                                    |   22 +-
 fs/ocfs2/dlm/dlmrecovery.c                         |    1 -
 fs/ocfs2/dlm/dlmunlock.c                           |    6 +
 fs/pipe.c                                          |    3 +-
 fs/proc/base.c                                     |   43 +-
 fs/proc/generic.c                                  |    4 +-
 fs/proc/internal.h                                 |    1 +
 fs/proc/page.c                                     |    4 +-
 fs/proc/proc_net.c                                 |   20 +
 fs/proc/task_mmu.c                                 |   17 +-
 include/linux/balloon_compaction.h                 |   34 +-
 include/linux/compaction.h                         |    5 +-
 include/linux/device.h                             |    2 +-
 include/linux/flex_array.h                         |  149 ---
 include/linux/genalloc.h                           |    2 +-
 include/linux/generic-radix-tree.h                 |  231 +++++
 include/linux/gfp.h                                |    7 +-
 include/linux/hugetlb.h                            |   48 +-
 include/linux/ipc_namespace.h                      |    1 +
 include/linux/kernel.h                             |    2 +-
 include/linux/ksm.h                                |    7 +
 include/linux/memblock.h                           |   41 +
 include/linux/memcontrol.h                         |   37 +-
 include/linux/memory_hotplug.h                     |    2 +-
 include/linux/mm.h                                 |  100 +-
 include/linux/mm_types.h                           |   73 +-
 include/linux/mmu_notifier.h                       |   35 +-
 include/linux/mmzone.h                             |    2 +
 include/linux/nodemask.h                           |   15 +-
 include/linux/page-flags.h                         |   11 +-
 include/linux/pagemap.h                            |    1 +
 include/linux/poison.h                             |    3 -
 include/linux/sched.h                              |   14 +
 include/linux/sched/signal.h                       |   18 +
 include/linux/slub_def.h                           |    2 +-
 include/linux/swap.h                               |   13 +-
 include/net/sctp/structs.h                         |   15 +-
 include/uapi/linux/binfmts.h                       |    2 +-
 include/uapi/linux/kernel-page-flags.h             |    2 +-
 init/init_task.c                                   |    3 +-
 init/main.c                                        |    5 +
 ipc/ipc_sysctl.c                                   |   14 +-
 ipc/util.c                                         |   29 +-
 ipc/util.h                                         |   46 +-
 kernel/crash_core.c                                |    2 +
 kernel/dma/remap.c                                 |    2 +-
 kernel/events/uprobes.c                            |    3 +-
 kernel/exit.c                                      |   15 +-
 kernel/fork.c                                      |    1 +
 kernel/kthread.c                                   |    3 +-
 kernel/locking/lockdep.c                           |   19 +
 kernel/panic.c                                     |   10 +-
 kernel/power/snapshot.c                            |   17 +-
 kernel/ptrace.c                                    |   15 +-
 kernel/sched/core.c                                |    3 +
 kernel/sched/fair.c                                |   15 +-
 kernel/signal.c                                    |    2 +-
 kernel/sysctl.c                                    |   49 +-
 lib/Kconfig.debug                                  |   18 +
 lib/Makefile                                       |    6 +-
 lib/cpumask.c                                      |    3 +-
 lib/debugobjects.c                                 |   66 +-
 lib/flex_array.c                                   |  398 --------
 lib/genalloc.c                                     |    5 +-
 lib/generic-radix-tree.c                           |  217 ++++
 lib/test_vmalloc.c                                 |  551 +++++++++++
 mm/compaction.c                                    | 1038 +++++++++++++++-----
 mm/filemap.c                                       |  223 +++--
 mm/huge_memory.c                                   |   25 +-
 mm/hugetlb.c                                       |   18 +-
 mm/internal.h                                      |   24 +-
 mm/khugepaged.c                                    |    3 +-
 mm/ksm.c                                           |   38 +-
 mm/madvise.c                                       |    3 +-
 mm/memblock.c                                      |   64 ++
 mm/memcontrol.c                                    |   51 +-
 mm/memory.c                                        |   48 +-
 mm/memory_hotplug.c                                |   82 +-
 mm/mempolicy.c                                     |    4 +-
 mm/migrate.c                                       |    9 +-
 mm/mprotect.c                                      |    3 +-
 mm/mremap.c                                        |    3 +-
 mm/oom_kill.c                                      |    8 +-
 mm/page_alloc.c                                    |  709 ++++++++-----
 mm/page_ext.c                                      |    5 +-
 mm/page_owner.c                                    |    4 +-
 mm/page_poison.c                                   |    2 +
 mm/rmap.c                                          |    6 +-
 mm/slab.h                                          |    4 -
 mm/slub.c                                          |    7 +-
 mm/swap_state.c                                    |   16 +-
 mm/swapfile.c                                      |  156 ++-
 mm/vmalloc.c                                       |   59 +-
 net/core/pktgen.c                                  |    3 +-
 net/openvswitch/flow.h                             |    1 -
 net/openvswitch/flow_netlink.h                     |    1 -
 net/openvswitch/flow_table.c                       |   51 +-
 net/openvswitch/flow_table.h                       |    3 +-
 net/qrtr/qrtr.c                                    |    3 +-
 net/sctp/stream.c                                  |  105 +-
 net/sctp/stream_interleave.c                       |    2 +-
 scripts/checkpatch.pl                              |    6 +-
 scripts/decode_stacktrace.sh                       |    9 +-
 security/selinux/ss/avtab.c                        |   40 +-
 security/selinux/ss/avtab.h                        |    4 +-
 security/selinux/ss/conditional.c                  |    6 +-
 security/selinux/ss/policydb.c                     |  122 +--
 security/selinux/ss/policydb.h                     |   12 +-
 security/selinux/ss/services.c                     |   22 +-
 tools/include/linux/numa.h                         |   16 +
 tools/include/linux/poison.h                       |    3 -
 tools/perf/bench/numa.c                            |    7 +-
 tools/testing/selftests/proc/.gitignore            |    1 +
 tools/testing/selftests/proc/Makefile              |    1 +
 tools/testing/selftests/proc/proc-loadavg-001.c    |    2 +-
 .../selftests/proc/proc-self-map-files-002.c       |    2 +-
 tools/testing/selftests/proc/proc-self-syscall.c   |    2 +-
 tools/testing/selftests/proc/proc-self-wchan.c     |    2 +-
 tools/testing/selftests/proc/read.c                |    2 +-
 tools/testing/selftests/proc/setns-dcache.c        |  129 +++
 tools/testing/selftests/vm/run_vmtests             |   16 +
 tools/testing/selftests/vm/test_vmalloc.sh         |  176 ++++
 tools/vm/page-types.c                              |    2 +-
 214 files changed, 4562 insertions(+), 2453 deletions(-)
 delete mode 100644 Documentation/core-api/flexible-arrays.rst
 create mode 100644 Documentation/core-api/generic-radix-tree.rst
 delete mode 100644 Documentation/flexible-arrays.txt
 delete mode 100644 include/linux/flex_array.h
 create mode 100644 include/linux/generic-radix-tree.h
 delete mode 100644 lib/flex_array.c
 create mode 100644 lib/generic-radix-tree.c
 create mode 100644 lib/test_vmalloc.c
 create mode 100644 tools/include/linux/numa.h
 create mode 100644 tools/testing/selftests/proc/setns-dcache.c
 create mode 100644 tools/testing/selftests/vm/test_vmalloc.sh
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: scripts/atomic/check-atomics.sh: don't assume that scripts are executable
Applying: include/linux/sched/signal.h: replace `tsk' with `task'
Applying: locking/atomics: build atomic headers as required
Applying: kernel/fork.c: remove duplicated include
Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + f9621904f6dd...e5a18af204a6 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (e5a18af204a6 drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
$ git merge --no-ff akpm/master
Removing include/linux/atomic-fallback.h
Removing include/asm-generic/atomic-long.h
Removing include/asm-generic/atomic-instrumented.h
Merge made by the 'recursive' strategy.
 Kbuild                                       |   18 +-
 Makefile                                     |    8 +-
 arch/arm64/include/asm/atomic.h              |    2 +-
 arch/x86/include/asm/atomic.h                |    2 +-
 drivers/media/platform/sti/delta/delta-ipc.c |    4 +-
 include/asm-generic/atomic-instrumented.h    | 1787 --------------------
 include/asm-generic/atomic-long.h            | 1012 ------------
 include/linux/atomic-fallback.h              | 2294 --------------------------
 include/linux/atomic.h                       |    4 +-
 include/linux/sched/signal.h                 |   51 +-
 kernel/fork.c                                |    1 -
 scripts/Makefile.genheader                   |   23 +
 scripts/atomic/check-atomics.sh              |    2 +-
 13 files changed, 64 insertions(+), 5144 deletions(-)
 delete mode 100644 include/asm-generic/atomic-instrumented.h
 delete mode 100644 include/asm-generic/atomic-long.h
 delete mode 100644 include/linux/atomic-fallback.h
 create mode 100644 scripts/Makefile.genheader