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
|
$ date -R
Sun, 16 Oct 2016 07:50:25 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at b67be92feb48 Merge tag 'pwm/for-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm
Merging origin/master (1001354ca341 Linux 4.9-rc1)
$ git merge origin/master
Updating b67be92feb48..1001354ca341
Fast-forward
.mailmap | 1 +
Documentation/00-INDEX | 3 +-
Documentation/80211/cfg80211.rst | 345 ++
Documentation/80211/conf.py | 5 +
Documentation/80211/index.rst | 17 +
Documentation/80211/introduction.rst | 17 +
Documentation/80211/mac80211-advanced.rst | 295 ++
Documentation/80211/mac80211.rst | 216 ++
Documentation/DocBook/80211.tmpl | 584 ----
Documentation/DocBook/Makefile | 2 +-
Documentation/Makefile | 4 +-
Documentation/accounting/Makefile | 7 -
Documentation/accounting/delay-accounting.txt | 6 +-
Documentation/arm/00-INDEX | 2 -
Documentation/auxdisplay/Makefile | 7 -
Documentation/auxdisplay/cfag12864b | 2 +-
Documentation/blackfin/00-INDEX | 4 -
Documentation/blackfin/Makefile | 5 -
.../bindings/auxdisplay/img-ascii-lcd.txt | 17 +
Documentation/devicetree/bindings/i2c/i2c.txt | 8 +
.../devicetree/bindings/i2c/trivial-devices.txt | 1 -
.../bindings/infiniband/hisilicon-hns-roce.txt | 2 +
.../bindings/input/touchscreen/melfas_mip4.txt | 21 +
.../devicetree/bindings/mips/brcm/soc.txt | 4 +-
.../devicetree/bindings/rtc/dallas,ds1390.txt | 2 +-
.../devicetree/bindings/rtc/epson,rx8900.txt | 22 +
Documentation/devicetree/bindings/rtc/rtc-omap.txt | 21 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
.../devicetree/bindings/watchdog/of-xilinx-wdt.txt | 3 +
.../devicetree/bindings/watchdog/st_lpc_wdt.txt | 3 +-
.../features/perf/kprobes-event/arch-support.txt | 2 +-
Documentation/filesystems/00-INDEX | 2 -
Documentation/filesystems/Makefile | 5 -
Documentation/ia64/Makefile | 5 -
Documentation/index.rst | 1 +
Documentation/input/alps.txt | 57 +
Documentation/kbuild/makefiles.txt | 16 +
Documentation/kernel-parameters.txt | 21 +-
Documentation/kselftest.txt | 5 +-
Documentation/laptops/00-INDEX | 4 -
Documentation/laptops/Makefile | 5 -
Documentation/laptops/laptop-mode.txt | 2 +-
Documentation/mic/Makefile | 1 -
Documentation/mic/mpssd/Makefile | 21 -
Documentation/misc-devices/Makefile | 1 -
Documentation/misc-devices/mei/Makefile | 5 -
Documentation/networking/00-INDEX | 2 -
Documentation/networking/Makefile | 1 -
Documentation/networking/timestamping/Makefile | 14 -
Documentation/pcmcia/Makefile | 7 -
Documentation/pcmcia/devicetable.txt | 4 +-
Documentation/prctl/Makefile | 10 -
Documentation/ptp/Makefile | 8 -
Documentation/scsi/g_NCR5380.txt | 34 +-
Documentation/spi/00-INDEX | 2 -
Documentation/timers/00-INDEX | 4 -
Documentation/timers/Makefile | 5 -
Documentation/timers/hpet.txt | 2 +-
Documentation/vDSO/Makefile | 17 -
Documentation/watchdog/Makefile | 1 -
Documentation/watchdog/src/Makefile | 5 -
Documentation/watchdog/watchdog-api.txt | 2 +-
Documentation/watchdog/watchdog-kernel-api.txt | 33 +
Documentation/watchdog/wdt.txt | 2 +-
MAINTAINERS | 56 +-
Makefile | 26 +-
arch/Kconfig | 39 +
arch/alpha/include/asm/Kbuild | 1 +
arch/alpha/include/asm/uaccess.h | 9 +-
arch/alpha/kernel/Makefile | 2 +-
arch/alpha/kernel/alpha_ksyms.c | 102 -
arch/alpha/kernel/machvec_impl.h | 6 +-
arch/alpha/kernel/setup.c | 1 +
arch/alpha/lib/callback_srm.S | 5 +
arch/alpha/lib/checksum.c | 3 +
arch/alpha/lib/clear_page.S | 3 +-
arch/alpha/lib/clear_user.S | 2 +
arch/alpha/lib/copy_page.S | 3 +-
arch/alpha/lib/copy_user.S | 19 +-
arch/alpha/lib/csum_ipv6_magic.S | 2 +
arch/alpha/lib/csum_partial_copy.c | 2 +
arch/alpha/lib/dec_and_lock.c | 2 +
arch/alpha/lib/divide.S | 3 +
arch/alpha/lib/ev6-clear_page.S | 3 +-
arch/alpha/lib/ev6-clear_user.S | 3 +-
arch/alpha/lib/ev6-copy_page.S | 3 +-
arch/alpha/lib/ev6-copy_user.S | 26 +-
arch/alpha/lib/ev6-csum_ipv6_magic.S | 2 +
arch/alpha/lib/ev6-divide.S | 3 +
arch/alpha/lib/ev6-memchr.S | 3 +-
arch/alpha/lib/ev6-memcpy.S | 3 +-
arch/alpha/lib/ev6-memset.S | 7 +-
arch/alpha/lib/ev67-strcat.S | 3 +-
arch/alpha/lib/ev67-strchr.S | 3 +-
arch/alpha/lib/ev67-strlen.S | 3 +-
arch/alpha/lib/ev67-strncat.S | 3 +-
arch/alpha/lib/ev67-strrchr.S | 3 +-
arch/alpha/lib/fpreg.c | 7 +
arch/alpha/lib/memchr.S | 3 +-
arch/alpha/lib/memcpy.c | 5 +-
arch/alpha/lib/memmove.S | 3 +-
arch/alpha/lib/memset.S | 7 +-
arch/alpha/lib/strcat.S | 2 +
arch/alpha/lib/strchr.S | 3 +-
arch/alpha/lib/strcpy.S | 3 +-
arch/alpha/lib/strlen.S | 3 +-
arch/alpha/lib/strncat.S | 3 +-
arch/alpha/lib/strncpy.S | 3 +-
arch/alpha/lib/strrchr.S | 3 +-
arch/arc/kernel/signal.c | 8 +-
arch/arm/include/asm/Kbuild | 1 +
arch/arm/include/asm/uaccess.h | 11 +-
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/armksyms.c | 183 -
arch/arm/kernel/entry-ftrace.S | 3 +
arch/arm/kernel/head.S | 3 +
arch/arm/kernel/smccc-call.S | 3 +
arch/arm/lib/ashldi3.S | 3 +
arch/arm/lib/ashrdi3.S | 3 +
arch/arm/lib/bitops.h | 5 +
arch/arm/lib/bswapsdi2.S | 3 +
arch/arm/lib/clear_user.S | 4 +
arch/arm/lib/copy_from_user.S | 11 +-
arch/arm/lib/copy_page.S | 2 +
arch/arm/lib/copy_to_user.S | 4 +
arch/arm/lib/csumipv6.S | 3 +-
arch/arm/lib/csumpartial.S | 2 +
arch/arm/lib/csumpartialcopy.S | 1 +
arch/arm/lib/csumpartialcopygeneric.S | 2 +
arch/arm/lib/csumpartialcopyuser.S | 1 +
arch/arm/lib/delay.c | 2 +
arch/arm/lib/div64.S | 2 +
arch/arm/lib/findbit.S | 9 +
arch/arm/lib/getuser.S | 9 +
arch/arm/lib/io-readsb.S | 2 +
arch/arm/lib/io-readsl.S | 2 +
arch/arm/lib/io-readsw-armv3.S | 3 +-
arch/arm/lib/io-readsw-armv4.S | 2 +
arch/arm/lib/io-writesb.S | 2 +
arch/arm/lib/io-writesl.S | 2 +
arch/arm/lib/io-writesw-armv3.S | 2 +
arch/arm/lib/io-writesw-armv4.S | 2 +
arch/arm/lib/lib1funcs.S | 9 +
arch/arm/lib/lshrdi3.S | 3 +
arch/arm/lib/memchr.S | 2 +
arch/arm/lib/memcpy.S | 3 +
arch/arm/lib/memmove.S | 2 +
arch/arm/lib/memset.S | 3 +
arch/arm/lib/memzero.S | 2 +
arch/arm/lib/muldi3.S | 3 +
arch/arm/lib/putuser.S | 5 +
arch/arm/lib/strchr.S | 2 +
arch/arm/lib/strrchr.S | 2 +
arch/arm/lib/uaccess_with_memcpy.c | 3 +
arch/arm/lib/ucmpdi2.S | 3 +
arch/arm/mach-imx/Makefile | 1 -
arch/arm/mach-imx/ssi-fiq-ksym.c | 20 -
arch/arm/mach-imx/ssi-fiq.S | 7 +-
arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 3 +-
arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +
arch/arm64/include/asm/uaccess.h | 10 +-
arch/arm64/lib/copy_from_user.S | 7 +-
arch/blackfin/include/asm/uaccess.h | 32 +-
arch/ia64/hp/sim/boot/Makefile | 2 +-
arch/ia64/include/asm/export.h | 3 +
arch/ia64/include/asm/libata-portmap.h | 4 -
arch/ia64/kernel/entry.S | 3 +
arch/ia64/kernel/esi_stub.S | 2 +
arch/ia64/kernel/head.S | 2 +
arch/ia64/kernel/ia64_ksyms.c | 94 +-
arch/ia64/kernel/ivt.S | 2 +
arch/ia64/kernel/pal.S | 7 +
arch/ia64/kernel/setup.c | 4 +
arch/ia64/lib/Makefile | 8 +-
arch/ia64/lib/clear_page.S | 2 +
arch/ia64/lib/clear_user.S | 2 +
arch/ia64/lib/copy_page.S | 2 +
arch/ia64/lib/copy_page_mck.S | 2 +
arch/ia64/lib/copy_user.S | 2 +
arch/ia64/lib/flush.S | 2 +
arch/ia64/lib/idiv32.S | 2 +
arch/ia64/lib/idiv64.S | 2 +
arch/ia64/lib/ip_fast_csum.S | 3 +
arch/ia64/lib/memcpy.S | 2 +
arch/ia64/lib/memcpy_mck.S | 3 +
arch/ia64/lib/memset.S | 2 +
arch/ia64/lib/strlen.S | 2 +
arch/ia64/lib/strlen_user.S | 2 +
arch/ia64/lib/strncpy_from_user.S | 2 +
arch/ia64/lib/strnlen_user.S | 2 +
arch/ia64/lib/xor.S | 5 +
arch/m68k/include/asm/export.h | 3 +
arch/m68k/kernel/Makefile | 2 +-
arch/m68k/kernel/m68k_ksyms.c | 32 -
arch/m68k/lib/ashldi3.c | 4 +
arch/m68k/lib/ashrdi3.c | 4 +
arch/m68k/lib/divsi3.S | 3 +
arch/m68k/lib/lshrdi3.c | 4 +
arch/m68k/lib/modsi3.S | 3 +
arch/m68k/lib/muldi3.c | 4 +
arch/m68k/lib/mulsi3.S | 4 +-
arch/m68k/lib/udivsi3.S | 4 +-
arch/m68k/lib/umodsi3.S | 4 +-
arch/metag/include/asm/atomic.h | 3 +-
arch/mips/Kbuild.platforms | 2 +-
arch/mips/Kconfig | 121 +-
arch/mips/Makefile | 77 +-
arch/mips/alchemy/common/setup.c | 6 +-
arch/mips/bcm47xx/serial.c | 11 +-
arch/mips/bcm63xx/clk.c | 3 +
arch/mips/bmips/Kconfig | 20 +-
arch/mips/bmips/setup.c | 12 +-
arch/mips/boot/Makefile | 66 +
arch/mips/boot/dts/brcm/Makefile | 36 +-
.../mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts | 22 +
arch/mips/boot/dts/brcm/bcm3368.dtsi | 101 +
.../boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts | 108 +
arch/mips/boot/dts/brcm/bcm63268.dtsi | 134 +
...6358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} | 1 +
.../boot/dts/brcm/bcm6362-neufbox6-sercomm.dts | 22 +
arch/mips/boot/dts/brcm/bcm6362.dtsi | 134 +
arch/mips/boot/dts/brcm/bcm7125.dtsi | 34 +-
arch/mips/boot/dts/brcm/bcm7346.dtsi | 97 +-
arch/mips/boot/dts/brcm/bcm7358.dtsi | 89 +-
arch/mips/boot/dts/brcm/bcm7360.dtsi | 89 +-
arch/mips/boot/dts/brcm/bcm7362.dtsi | 89 +-
arch/mips/boot/dts/brcm/bcm7420.dtsi | 42 +-
arch/mips/boot/dts/brcm/bcm7425.dtsi | 109 +-
arch/mips/boot/dts/brcm/bcm7435.dtsi | 109 +-
arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 4 +
arch/mips/boot/dts/brcm/bcm97346dbsmb.dts | 17 +
arch/mips/boot/dts/brcm/bcm97358svmb.dts | 13 +
arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 +
arch/mips/boot/dts/brcm/bcm97362svmb.dts | 13 +
arch/mips/boot/dts/brcm/bcm97420c.dts | 8 +
arch/mips/boot/dts/brcm/bcm97425svmb.dts | 21 +
arch/mips/boot/dts/brcm/bcm97435svmb.dts | 21 +
.../boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi | 25 +
.../mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi | 25 +
.../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 45 +-
.../dts/cavium-octeon/dlink_dsr-500n-1000n.dtsi | 58 +
.../mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts | 40 +
arch/mips/boot/dts/mti/Makefile | 2 +-
arch/mips/boot/dts/mti/malta.dts | 99 +
arch/mips/boot/dts/mti/sead3.dts | 238 ++
.../cavium-octeon/executive/cvmx-helper-board.c | 337 +-
.../cavium-octeon/executive/cvmx-helper-rgmii.c | 5 +-
.../cavium-octeon/executive/cvmx-helper-sgmii.c | 1 -
.../cavium-octeon/executive/cvmx-helper-xaui.c | 2 -
arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 -
arch/mips/cavium-octeon/setup.c | 38 +-
arch/mips/configs/generic/32r1.config | 2 +
arch/mips/configs/generic/32r2.config | 3 +
arch/mips/configs/generic/32r6.config | 2 +
arch/mips/configs/generic/64r1.config | 4 +
arch/mips/configs/generic/64r2.config | 5 +
arch/mips/configs/generic/64r6.config | 4 +
arch/mips/configs/generic/board-sead-3.config | 32 +
arch/mips/configs/generic/eb.config | 1 +
arch/mips/configs/generic/el.config | 1 +
arch/mips/configs/generic/micro32r2.config | 4 +
arch/mips/configs/generic_defconfig | 96 +
arch/mips/configs/loongson1c_defconfig | 126 +
arch/mips/configs/malta_defconfig | 4 +-
arch/mips/configs/malta_kvm_defconfig | 4 +-
arch/mips/configs/malta_kvm_guest_defconfig | 4 +-
arch/mips/configs/malta_qemu_32r6_defconfig | 2 +
arch/mips/configs/maltaaprp_defconfig | 2 +
arch/mips/configs/maltasmvp_defconfig | 2 +
arch/mips/configs/maltasmvp_eva_defconfig | 2 +
arch/mips/configs/maltaup_defconfig | 2 +
arch/mips/configs/maltaup_xpa_defconfig | 4 +-
arch/mips/configs/pistachio_defconfig | 2 -
arch/mips/configs/sead3_defconfig | 121 -
arch/mips/configs/sead3micro_defconfig | 122 -
arch/mips/generic/Kconfig | 19 +
arch/mips/generic/Makefile | 15 +
arch/mips/generic/Platform | 14 +
arch/mips/generic/board-sead3.c | 376 +++
arch/mips/generic/init.c | 176 +
arch/mips/generic/irq.c | 64 +
arch/mips/generic/proc.c | 29 +
arch/mips/generic/vmlinux.its.S | 31 +
arch/mips/include/asm/addrspace.h | 3 +-
arch/mips/include/asm/barrier.h | 96 +
arch/mips/include/asm/cacheflush.h | 5 +
arch/mips/include/asm/cpu-type.h | 3 +-
arch/mips/include/asm/cpu.h | 1 +
arch/mips/include/asm/device.h | 5 +
arch/mips/include/asm/dma-coherence.h | 16 +-
arch/mips/include/asm/dma-mapping.h | 10 +
arch/mips/include/asm/i8259.h | 12 +-
arch/mips/include/asm/mach-generic/dma-coherence.h | 14 +-
arch/mips/include/asm/mach-generic/floppy.h | 6 +-
arch/mips/include/asm/mach-generic/spaces.h | 8 +-
arch/mips/include/asm/mach-ip27/spaces.h | 1 +
arch/mips/include/asm/mach-loongson32/irq.h | 41 +-
arch/mips/include/asm/mach-loongson32/loongson1.h | 5 +
arch/mips/include/asm/mach-loongson32/platform.h | 1 +
arch/mips/include/asm/mach-loongson32/regs-clk.h | 34 +
arch/mips/include/asm/mach-loongson32/regs-mux.h | 61 +
.../include/asm/mach-sead3/cpu-feature-overrides.h | 72 -
arch/mips/include/asm/mach-sead3/irq.h | 9 -
.../include/asm/mach-sead3/kernel-entry-init.h | 21 -
arch/mips/include/asm/mach-sead3/war.h | 24 -
arch/mips/include/asm/machine.h | 63 +
arch/mips/include/asm/mips-boards/sead3int.h | 32 -
arch/mips/include/asm/mips-cm.h | 1 +
arch/mips/include/asm/octeon/cvmx-helper-board.h | 30 -
arch/mips/include/asm/octeon/cvmx-mdio.h | 506 ---
arch/mips/include/asm/pci.h | 60 +-
arch/mips/include/asm/pgalloc.h | 6 +-
arch/mips/include/asm/pm-cps.h | 6 +-
arch/mips/include/asm/ptrace.h | 2 +-
arch/mips/include/asm/smp.h | 14 +
arch/mips/include/asm/uaccess.h | 18 +
arch/mips/include/uapi/asm/unistd.h | 22 +-
arch/mips/kernel/binfmt_elfn32.c | 8 +-
arch/mips/kernel/binfmt_elfo32.c | 8 +-
arch/mips/kernel/branch.c | 36 +-
arch/mips/kernel/kprobes.c | 67 +-
arch/mips/kernel/linux32.c | 1 -
arch/mips/kernel/mips-cpc.c | 17 +-
arch/mips/kernel/mips-r2-to-r6-emul.c | 1 -
arch/mips/kernel/module.c | 1 +
arch/mips/kernel/pm-cps.c | 160 +-
arch/mips/kernel/probes-common.h | 83 +
arch/mips/kernel/proc.c | 7 +
arch/mips/kernel/scall32-o32.S | 3 +
arch/mips/kernel/scall64-64.S | 3 +
arch/mips/kernel/scall64-n32.S | 3 +
arch/mips/kernel/scall64-o32.S | 3 +
arch/mips/kernel/smp-gic.c | 66 -
arch/mips/kernel/smp-mt.c | 23 -
arch/mips/kernel/smp.c | 65 +-
arch/mips/kernel/traps.c | 53 +-
arch/mips/kernel/uprobes.c | 88 +-
arch/mips/kvm/commpage.c | 1 -
arch/mips/kvm/dyntrans.c | 5 +-
arch/mips/kvm/emulate.c | 1 -
arch/mips/kvm/interrupt.c | 1 -
arch/mips/kvm/trap_emul.c | 1 -
arch/mips/lantiq/xway/vmmc.c | 6 +-
arch/mips/lantiq/xway/xrx200_phy_fw.c | 12 +-
arch/mips/lib/ashldi3.c | 2 +-
arch/mips/lib/ashrdi3.c | 2 +-
arch/mips/lib/bswapdi.c | 3 +-
arch/mips/lib/bswapsi.c | 3 +-
arch/mips/lib/cmpdi2.c | 2 +-
arch/mips/lib/delay.c | 2 +-
arch/mips/lib/iomap-pci.c | 6 +-
arch/mips/lib/iomap.c | 2 +-
arch/mips/lib/lshrdi3.c | 2 +-
arch/mips/lib/ucmpdi2.c | 2 +-
arch/mips/loongson32/Kconfig | 15 +
arch/mips/loongson32/Makefile | 6 +
arch/mips/loongson32/Platform | 1 +
arch/mips/loongson32/common/irq.c | 55 +-
arch/mips/loongson32/common/platform.c | 32 +
arch/mips/loongson32/common/setup.c | 4 +
arch/mips/loongson32/ls1c/Makefile | 5 +
arch/mips/loongson32/ls1c/board.c | 27 +
arch/mips/mm/c-octeon.c | 2 +
arch/mips/mm/c-r3k.c | 2 +
arch/mips/mm/c-r4k.c | 61 +-
arch/mips/mm/c-tx39.c | 3 +
arch/mips/mm/cache.c | 8 +-
arch/mips/mm/dma-default.c | 18 +-
arch/mips/mm/extable.c | 2 +-
arch/mips/mm/fault.c | 1 -
arch/mips/mm/highmem.c | 3 +-
arch/mips/mm/init.c | 2 +-
arch/mips/mm/ioremap.c | 2 +-
arch/mips/mm/mmap.c | 2 +-
arch/mips/mm/page.c | 1 -
arch/mips/mm/tlb-r4k.c | 9 +-
arch/mips/mti-malta/malta-dt.c | 15 -
arch/mips/mti-malta/malta-dtshim.c | 187 +-
arch/mips/mti-malta/malta-init.c | 17 +-
arch/mips/mti-malta/malta-int.c | 111 +-
arch/mips/mti-malta/malta-platform.c | 73 +-
arch/mips/mti-malta/malta-reset.c | 21 +-
arch/mips/mti-malta/malta-setup.c | 10 +-
arch/mips/mti-sead3/Makefile | 15 -
arch/mips/mti-sead3/Platform | 7 -
arch/mips/mti-sead3/sead3-console.c | 46 -
arch/mips/mti-sead3/sead3-display.c | 77 -
arch/mips/mti-sead3/sead3-init.c | 152 -
arch/mips/mti-sead3/sead3-int.c | 42 -
arch/mips/mti-sead3/sead3-lcd.c | 43 -
arch/mips/mti-sead3/sead3-platform.c | 223 --
arch/mips/mti-sead3/sead3-reset.c | 40 -
arch/mips/mti-sead3/sead3-setup.c | 108 -
arch/mips/mti-sead3/sead3-time.c | 99 -
arch/mips/pci/Makefile | 2 +
arch/mips/pci/pci-alchemy.c | 3 +-
arch/mips/pci/pci-ar71xx.c | 2 +-
arch/mips/pci/pci-ar724x.c | 2 +-
arch/mips/pci/pci-generic.c | 52 +
arch/mips/pci/pci-lantiq.c | 2 -
arch/mips/pci/pci-legacy.c | 302 ++
arch/mips/pci/pci-mt7620.c | 3 -
arch/mips/pci/pci-octeon.c | 2 +
arch/mips/pci/pci-rt2880.c | 2 -
arch/mips/pci/pci-rt3883.c | 2 -
arch/mips/pci/pci.c | 297 +-
arch/mips/pci/pcie-octeon.c | 2 +-
arch/mips/pnx833x/common/platform.c | 8 +-
arch/mips/ralink/timer.c | 28 +-
arch/mips/txx9/Kconfig | 2 +-
arch/mips/txx9/generic/pci.c | 6 +-
arch/mips/txx9/generic/setup.c | 70 +-
arch/mips/txx9/generic/setup_tx3927.c | 1 -
arch/mips/txx9/generic/setup_tx4927.c | 1 -
arch/mips/txx9/generic/setup_tx4938.c | 1 -
arch/mips/txx9/jmr3927/setup.c | 11 +-
arch/mips/txx9/rbtx4927/setup.c | 32 +-
arch/mips/txx9/rbtx4938/setup.c | 1 +
arch/mips/vdso/Makefile | 4 +-
arch/powerpc/Makefile | 4 +-
arch/powerpc/configs/dpaa.config | 1 +
arch/powerpc/include/asm/Kbuild | 1 +
arch/powerpc/include/asm/cputable.h | 1 +
arch/powerpc/include/asm/hw_irq.h | 6 +
arch/powerpc/include/asm/libata-portmap.h | 4 -
arch/powerpc/include/asm/ppc-opcode.h | 1 +
arch/powerpc/include/asm/reg.h | 2 +
arch/powerpc/include/asm/reg_8xx.h | 4 +
arch/powerpc/kernel/Makefile | 9 +-
arch/powerpc/kernel/cputable.c | 1 +
arch/powerpc/kernel/entry_32.S | 2 +
arch/powerpc/kernel/entry_64.S | 3 +
arch/powerpc/kernel/epapr_hcalls.S | 2 +
arch/powerpc/kernel/exceptions-64s.S | 2 +-
arch/powerpc/kernel/fpu.S | 3 +
arch/powerpc/kernel/head_32.S | 5 +
arch/powerpc/kernel/head_40x.S | 2 +
arch/powerpc/kernel/head_44x.S | 2 +
arch/powerpc/kernel/head_64.S | 2 +
arch/powerpc/kernel/head_8xx.S | 138 +-
arch/powerpc/kernel/head_fsl_booke.S | 2 +
arch/powerpc/kernel/misc.S | 2 +
arch/powerpc/kernel/misc_32.S | 10 +
arch/powerpc/kernel/misc_64.S | 4 +
arch/powerpc/kernel/pci-common.c | 1 +
arch/powerpc/kernel/pci_32.c | 2 +
arch/powerpc/kernel/ppc_ksyms.c | 37 -
arch/powerpc/kernel/ppc_ksyms_32.c | 60 -
arch/powerpc/kernel/setup-common.c | 27 +-
arch/powerpc/kernel/setup_32.c | 6 +
arch/powerpc/kernel/time.c | 1 +
arch/powerpc/kernel/traps.c | 45 +-
arch/powerpc/kernel/vector.S | 3 +
arch/powerpc/lib/Makefile | 2 +-
arch/powerpc/lib/checksum_32.S | 3 +
arch/powerpc/lib/checksum_64.S | 3 +
arch/powerpc/lib/copy_32.S | 5 +
arch/powerpc/lib/copypage_64.S | 2 +
arch/powerpc/lib/copyuser_64.S | 4 +-
arch/powerpc/lib/hweight_64.S | 5 +
arch/powerpc/lib/mem_64.S | 3 +
arch/powerpc/lib/memcmp_64.S | 2 +
arch/powerpc/lib/memcpy_64.S | 2 +
arch/powerpc/lib/ppc_ksyms.c | 29 -
arch/powerpc/lib/string.S | 6 +
arch/powerpc/lib/string_64.S | 2 +
arch/powerpc/mm/hash_low_32.S | 3 +
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/platforms/82xx/Kconfig | 4 +-
arch/powerpc/platforms/82xx/ep8248e.c | 4 +-
arch/powerpc/platforms/83xx/asp834x.c | 4 +-
arch/powerpc/platforms/83xx/km83xx.c | 5 +-
arch/powerpc/platforms/83xx/misc.c | 8 +
arch/powerpc/platforms/83xx/mpc830x_rdb.c | 5 +-
arch/powerpc/platforms/83xx/mpc831x_rdb.c | 5 +-
arch/powerpc/platforms/83xx/mpc832x_mds.c | 5 +-
arch/powerpc/platforms/83xx/mpc832x_rdb.c | 5 +-
arch/powerpc/platforms/83xx/mpc834x_itx.c | 5 +-
arch/powerpc/platforms/83xx/mpc834x_mds.c | 5 +-
arch/powerpc/platforms/83xx/mpc836x_mds.c | 5 +-
arch/powerpc/platforms/83xx/mpc836x_rdk.c | 5 +-
arch/powerpc/platforms/83xx/mpc837x_mds.c | 5 +-
arch/powerpc/platforms/83xx/mpc837x_rdb.c | 5 +-
arch/powerpc/platforms/83xx/mpc83xx.h | 1 +
arch/powerpc/platforms/83xx/sbc834x.c | 5 +-
arch/powerpc/platforms/85xx/Kconfig | 2 +-
arch/powerpc/platforms/85xx/bsc913x_qds.c | 1 -
arch/powerpc/platforms/85xx/bsc913x_rdb.c | 1 -
arch/powerpc/platforms/85xx/c293pcie.c | 1 -
arch/powerpc/platforms/85xx/corenet_generic.c | 1 -
arch/powerpc/platforms/85xx/ge_imp3a.c | 1 -
arch/powerpc/platforms/85xx/mpc8536_ds.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_ads.c | 1 -
arch/powerpc/platforms/85xx/mpc85xx_cds.c | 25 +-
arch/powerpc/platforms/85xx/mpc85xx_ds.c | 3 -
arch/powerpc/platforms/85xx/mpc85xx_mds.c | 12 +-
arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 10 -
arch/powerpc/platforms/85xx/mvme2500.c | 1 -
arch/powerpc/platforms/85xx/p1010rdb.c | 1 -
arch/powerpc/platforms/85xx/p1022_ds.c | 1 -
arch/powerpc/platforms/85xx/p1022_rdk.c | 1 -
arch/powerpc/platforms/85xx/p1023_rdb.c | 1 -
arch/powerpc/platforms/85xx/ppa8548.c | 1 -
arch/powerpc/platforms/85xx/qemu_e500.c | 1 -
arch/powerpc/platforms/85xx/sbc8548.c | 1 -
arch/powerpc/platforms/85xx/sgy_cts1000.c | 8 +-
arch/powerpc/platforms/85xx/socrates.c | 1 -
arch/powerpc/platforms/85xx/stx_gp3.c | 1 -
arch/powerpc/platforms/85xx/tqm85xx.c | 1 -
arch/powerpc/platforms/85xx/twr_p102x.c | 1 -
arch/powerpc/platforms/85xx/xes_mpc85xx.c | 3 -
arch/powerpc/platforms/86xx/gef_ppc9a.c | 1 -
arch/powerpc/platforms/86xx/gef_sbc310.c | 1 -
arch/powerpc/platforms/86xx/gef_sbc610.c | 1 -
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 1 -
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 1 -
arch/powerpc/platforms/86xx/mvme7100.c | 1 -
arch/powerpc/platforms/86xx/sbc8641d.c | 1 -
arch/powerpc/platforms/pseries/lpar.c | 4 +-
arch/powerpc/relocs_check.sh | 4 +-
arch/powerpc/sysdev/cpm1.c | 2 -
arch/powerpc/sysdev/cpm2.c | 4 -
arch/powerpc/sysdev/cpm_common.c | 15 +
arch/powerpc/sysdev/dcr-low.S | 3 +
arch/powerpc/sysdev/fsl_pci.c | 12 +-
arch/powerpc/sysdev/fsl_soc.c | 33 +-
arch/powerpc/sysdev/fsl_soc.h | 2 -
arch/powerpc/sysdev/mpic.c | 2 +-
arch/s390/include/asm/Kbuild | 1 +
arch/s390/kernel/Makefile | 2 +-
arch/s390/kernel/entry.S | 6 +
arch/s390/kernel/mcount.S | 3 +
arch/s390/kernel/s390_ksyms.c | 15 -
arch/s390/lib/mem.S | 3 +
arch/score/kernel/traps.c | 1 +
arch/sparc/include/asm/Kbuild | 1 +
arch/sparc/include/asm/string.h | 34 +
arch/sparc/include/asm/string_32.h | 56 -
arch/sparc/include/asm/string_64.h | 44 -
arch/sparc/kernel/Makefile | 2 +-
arch/sparc/kernel/entry.S | 3 +
arch/sparc/kernel/head_32.S | 3 +
arch/sparc/kernel/head_64.S | 7 +-
arch/sparc/kernel/helpers.S | 2 +
arch/sparc/kernel/hvcalls.S | 5 +
arch/sparc/kernel/sparc_ksyms.c | 12 +
arch/sparc/kernel/sparc_ksyms_32.c | 31 -
arch/sparc/kernel/sparc_ksyms_64.c | 53 -
arch/sparc/lib/Makefile | 1 -
arch/sparc/lib/U1memcpy.S | 2 +
arch/sparc/lib/VISsave.S | 2 +
arch/sparc/lib/ashldi3.S | 2 +
arch/sparc/lib/ashrdi3.S | 2 +
arch/sparc/lib/atomic_64.S | 16 +-
arch/sparc/lib/bitops.S | 7 +
arch/sparc/lib/blockops.S | 3 +
arch/sparc/lib/bzero.S | 4 +
arch/sparc/lib/checksum_32.S | 3 +
arch/sparc/lib/checksum_64.S | 2 +
arch/sparc/lib/clear_page.S | 3 +
arch/sparc/lib/copy_in_user.S | 2 +
arch/sparc/lib/copy_page.S | 2 +
arch/sparc/lib/copy_user.S | 2 +
arch/sparc/lib/csum_copy.S | 3 +
arch/sparc/lib/divdi3.S | 2 +
arch/sparc/lib/ffs.S | 3 +
arch/sparc/lib/hweight.S | 5 +
arch/sparc/lib/ipcsum.S | 2 +
arch/sparc/lib/ksyms.c | 174 -
arch/sparc/lib/locks.S | 5 +
arch/sparc/lib/lshrdi3.S | 2 +
arch/sparc/lib/mcount.S | 2 +
arch/sparc/lib/memcmp.S | 2 +
arch/sparc/lib/memcpy.S | 86 +-
arch/sparc/lib/memmove.S | 2 +
arch/sparc/lib/memscan_32.S | 4 +
arch/sparc/lib/memscan_64.S | 4 +
arch/sparc/lib/memset.S | 3 +
arch/sparc/lib/muldi3.S | 2 +
arch/sparc/lib/strlen.S | 2 +
arch/sparc/lib/strncmp_32.S | 2 +
arch/sparc/lib/strncmp_64.S | 2 +
arch/sparc/lib/xor.S | 9 +
arch/x86/entry/entry_32.S | 2 +
arch/x86/entry/entry_64.S | 2 +
arch/x86/entry/thunk_32.S | 3 +
arch/x86/entry/thunk_64.S | 3 +
arch/x86/include/asm/export.h | 4 +
arch/x86/include/asm/percpu.h | 5 +-
arch/x86/kernel/Makefile | 4 +-
arch/x86/kernel/head_32.S | 2 +
arch/x86/kernel/head_64.S | 3 +
arch/x86/kernel/i386_ksyms_32.c | 47 -
arch/x86/kernel/mcount_64.S | 2 +
arch/x86/kernel/x8664_ksyms_64.c | 85 -
arch/x86/lib/checksum_32.S | 3 +
arch/x86/lib/clear_page_64.S | 2 +
arch/x86/lib/cmpxchg8b_emu.S | 2 +
arch/x86/lib/copy_page_64.S | 2 +
arch/x86/lib/copy_user_64.S | 8 +
arch/x86/lib/csum-partial_64.c | 1 +
arch/x86/lib/getuser.S | 5 +
arch/x86/lib/hweight.S | 3 +
arch/x86/lib/memcpy_64.S | 4 +
arch/x86/lib/memmove_64.S | 3 +
arch/x86/lib/memset_64.S | 3 +
arch/x86/lib/putuser.S | 5 +
arch/x86/lib/strstr_32.c | 3 +-
arch/x86/um/Makefile | 2 +-
arch/x86/um/checksum_32.S | 2 +
arch/x86/um/ksyms.c | 13 -
block/blk-cgroup.c | 4 +-
block/blk-softirq.c | 2 +-
drivers/acpi/acpi_pad.c | 5 +
drivers/acpi/ec.c | 2 +
drivers/acpi/fan.c | 12 +-
drivers/acpi/osl.c | 13 +-
drivers/acpi/property.c | 117 +-
drivers/ata/ahci.c | 149 +-
drivers/ata/ahci.h | 24 +-
drivers/ata/ahci_qoriq.c | 20 +-
drivers/ata/ahci_st.c | 4 +
drivers/ata/libahci.c | 9 +-
drivers/ata/libata-scsi.c | 288 +-
drivers/ata/pata_at91.c | 4 +-
drivers/ata/pata_octeon_cf.c | 3 +-
drivers/ata/sata_mv.c | 6 +-
drivers/auxdisplay/Kconfig | 9 +
drivers/auxdisplay/Makefile | 1 +
drivers/auxdisplay/img-ascii-lcd.c | 443 +++
drivers/char/random.c | 4 +-
drivers/cpufreq/cppc_cpufreq.c | 8 +-
drivers/cpufreq/cpufreq_conservative.c | 19 +-
drivers/cpufreq/intel_pstate.c | 43 +-
drivers/cpuidle/Kconfig.mips | 2 +-
drivers/cpuidle/cpuidle-cps.c | 2 +-
drivers/devfreq/devfreq.c | 8 +-
drivers/devfreq/event/Kconfig | 1 +
drivers/devfreq/event/exynos-nocp.c | 3 -
drivers/gpio/gpio-pca953x.c | 16 +
drivers/i2c/i2c-core.c | 10 +-
drivers/infiniband/Kconfig | 2 +
drivers/infiniband/hw/Makefile | 1 +
drivers/infiniband/hw/hns/hns_roce_cq.c | 23 +-
drivers/infiniband/hw/hns/hns_roce_device.h | 18 +-
drivers/infiniband/hw/hns/hns_roce_eq.c | 146 +-
drivers/infiniband/hw/hns/hns_roce_eq.h | 4 +
drivers/infiniband/hw/hns/hns_roce_hem.c | 76 +-
drivers/infiniband/hw/hns/hns_roce_hem.h | 4 +
drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 293 +-
drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 9 +
drivers/infiniband/hw/hns/hns_roce_main.c | 36 +-
drivers/infiniband/hw/hns/hns_roce_mr.c | 3 +
drivers/infiniband/hw/hns/hns_roce_pd.c | 22 +-
drivers/infiniband/hw/hns/hns_roce_qp.c | 67 +-
drivers/infiniband/hw/qedr/Kconfig | 7 +
drivers/infiniband/hw/qedr/Makefile | 3 +
drivers/infiniband/hw/qedr/main.c | 914 +++++
drivers/infiniband/hw/qedr/qedr.h | 495 +++
drivers/infiniband/hw/qedr/qedr_cm.c | 622 ++++
drivers/infiniband/hw/qedr/qedr_cm.h | 61 +
drivers/infiniband/hw/qedr/qedr_hsi.h | 56 +
drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 748 +++++
drivers/infiniband/hw/qedr/verbs.c | 3547 ++++++++++++++++++++
drivers/infiniband/hw/qedr/verbs.h | 101 +
drivers/input/mouse/alps.c | 87 +-
drivers/input/mouse/alps.h | 2 +
drivers/input/mouse/elantech.c | 27 +-
drivers/input/rmi4/rmi_i2c.c | 38 +-
drivers/input/rmi4/rmi_spi.c | 22 +-
drivers/input/serio/i8042-io.h | 2 +-
drivers/input/serio/i8042-ip22io.h | 2 +-
drivers/input/serio/i8042-ppcio.h | 2 +-
drivers/input/serio/i8042-sparcio.h | 2 +-
drivers/input/serio/i8042-unicore32io.h | 2 +-
drivers/input/serio/i8042-x86ia64io.h | 96 +-
drivers/input/serio/i8042.c | 55 +-
drivers/input/touchscreen/melfas_mip4.c | 38 +-
drivers/irqchip/irq-i8259.c | 30 +-
drivers/media/v4l2-core/Kconfig | 2 +-
.../ethernet/cavium/liquidio/cn23xx_pf_device.c | 2 +-
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 11 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 13 +-
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 2 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 10 -
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 1 -
drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 16 +
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 4 +
drivers/net/ethernet/hisilicon/hns/hns_enet.c | 107 +-
drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 7 +
.../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +-
drivers/net/ethernet/qlogic/Kconfig | 11 -
drivers/net/ethernet/qlogic/qed/qed_ll2.c | 4 +-
drivers/net/ethernet/qlogic/qed/qed_roce.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 21 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 10 +-
drivers/net/ethernet/ti/tlan.c | 2 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 11 +-
drivers/net/hyperv/netvsc_drv.c | 71 +-
drivers/net/phy/phy.c | 22 +-
drivers/net/usb/qmi_wwan.c | 30 +-
drivers/net/xen-netback/common.h | 4 +
drivers/net/xen-netback/hash.c | 68 +
drivers/net/xen-netback/rx.c | 8 +-
drivers/net/xen-netback/xenbus.c | 37 +-
drivers/of/platform.c | 1 +
drivers/pci/host/pci-aardvark.c | 39 +-
drivers/pci/host/pci-dra7xx.c | 103 +-
drivers/pci/host/pci-exynos.c | 220 +-
drivers/pci/host/pci-imx6.c | 250 +-
drivers/pci/host/pci-keystone-dw.c | 123 +-
drivers/pci/host/pci-keystone.c | 28 +-
drivers/pci/host/pci-keystone.h | 9 +-
drivers/pci/host/pci-layerscape.c | 65 +-
drivers/pci/host/pci-mvebu.c | 21 +-
drivers/pci/host/pci-rcar-gen2.c | 46 +-
drivers/pci/host/pci-tegra.c | 237 +-
drivers/pci/host/pci-xgene.c | 151 +-
drivers/pci/host/pcie-altera.c | 77 +-
drivers/pci/host/pcie-armada8k.c | 78 +-
drivers/pci/host/pcie-artpec6.c | 115 +-
drivers/pci/host/pcie-designware-plat.c | 25 +-
drivers/pci/host/pcie-designware.c | 102 +-
drivers/pci/host/pcie-designware.h | 7 +-
drivers/pci/host/pcie-hisi.c | 86 +-
drivers/pci/host/pcie-iproc-bcma.c | 14 +-
drivers/pci/host/pcie-iproc-platform.c | 27 +-
drivers/pci/host/pcie-iproc.c | 52 +-
drivers/pci/host/pcie-qcom.c | 30 +-
drivers/pci/host/pcie-rcar.c | 98 +-
drivers/pci/host/pcie-rockchip.c | 4 +-
drivers/pci/host/pcie-spear13xx.c | 108 +-
drivers/pci/host/pcie-xilinx-nwl.c | 109 +-
drivers/pci/host/pcie-xilinx.c | 62 +-
drivers/platform/x86/asus-laptop.c | 77 +-
drivers/platform/x86/asus-nb-wmi.c | 58 +
drivers/platform/x86/asus-wmi.c | 3 +
drivers/platform/x86/asus-wmi.h | 5 +
drivers/platform/x86/intel_pmc_core.c | 2 +-
drivers/platform/x86/intel_pmc_ipc.c | 110 +-
drivers/platform/x86/toshiba_acpi.c | 257 +-
drivers/platform/x86/toshiba_bluetooth.c | 4 +-
drivers/platform/x86/toshiba_haps.c | 14 +-
drivers/ptp/ptp_chardev.c | 1 +
drivers/rtc/Kconfig | 38 +-
drivers/rtc/Makefile | 1 -
drivers/rtc/rtc-ac100.c | 5 +
drivers/rtc/rtc-asm9260.c | 20 +-
drivers/rtc/rtc-at32ap700x.c | 2 +-
drivers/rtc/rtc-bq32k.c | 16 +-
drivers/rtc/rtc-cmos.c | 93 +-
drivers/rtc/rtc-coh901331.c | 2 +-
drivers/rtc/rtc-davinci.c | 2 +-
drivers/rtc/rtc-digicolor.c | 2 +-
drivers/rtc/rtc-ds1302.c | 2 +-
drivers/rtc/rtc-ds1307.c | 54 +-
drivers/rtc/rtc-ds1347.c | 96 +-
drivers/rtc/rtc-gemini.c | 2 +-
drivers/rtc/rtc-isl12057.c | 643 ----
drivers/rtc/rtc-jz4740.c | 2 +-
drivers/rtc/rtc-mcp795.c | 2 +-
drivers/rtc/rtc-mt6397.c | 2 +-
drivers/rtc/rtc-nuc900.c | 2 +-
drivers/rtc/rtc-omap.c | 170 +-
drivers/rtc/rtc-palmas.c | 2 +-
drivers/rtc/rtc-pcf2123.c | 5 +-
drivers/rtc/rtc-pcf50633.c | 2 +-
drivers/rtc/rtc-pic32.c | 1 -
drivers/rtc/rtc-rv8803.c | 50 +-
drivers/rtc/rtc-rx6110.c | 3 +-
drivers/rtc/rtc-rx8025.c | 2 +-
drivers/rtc/rtc-spear.c | 2 +-
drivers/rtc/rtc-stmp3xxx.c | 2 +-
drivers/rtc/rtc-sysfs.c | 4 +-
drivers/rtc/rtc-tegra.c | 2 +-
drivers/rtc/rtc-twl.c | 2 +-
drivers/scsi/be2iscsi/be_main.c | 12 +-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 5 +
drivers/scsi/g_NCR5380.c | 699 ++--
drivers/scsi/g_NCR5380.h | 8 -
drivers/scsi/ufs/Kconfig | 2 +-
drivers/scsi/ufs/ufs_quirks.h | 2 +
drivers/scsi/ufs/ufshcd.c | 10 +-
drivers/soc/Kconfig | 1 +
drivers/soc/fsl/Makefile | 1 +
drivers/soc/fsl/qbman/Kconfig | 67 +
drivers/soc/fsl/qbman/Makefile | 12 +
drivers/soc/fsl/qbman/bman.c | 797 +++++
drivers/soc/fsl/qbman/bman_ccsr.c | 263 ++
drivers/soc/fsl/qbman/bman_portal.c | 219 ++
drivers/soc/fsl/qbman/bman_priv.h | 80 +
drivers/soc/fsl/qbman/bman_test.c | 53 +
drivers/soc/fsl/qbman/bman_test.h | 35 +
drivers/soc/fsl/qbman/bman_test_api.c | 151 +
drivers/soc/fsl/qbman/dpaa_sys.h | 103 +
drivers/soc/fsl/qbman/qman.c | 2881 ++++++++++++++++
drivers/soc/fsl/qbman/qman_ccsr.c | 808 +++++
drivers/soc/fsl/qbman/qman_portal.c | 355 ++
drivers/soc/fsl/qbman/qman_priv.h | 371 ++
drivers/soc/fsl/qbman/qman_test.c | 62 +
drivers/soc/fsl/qbman/qman_test.h | 36 +
drivers/soc/fsl/qbman/qman_test_api.c | 252 ++
drivers/soc/fsl/qbman/qman_test_stash.c | 617 ++++
drivers/soc/fsl/qe/gpio.c | 3 +-
drivers/soc/fsl/qe/qe.c | 10 +-
drivers/soc/fsl/qe/qe_common.c | 8 +
drivers/soc/fsl/qe/qe_tdm.c | 4 +-
drivers/usb/host/ehci-hcd.c | 5 -
drivers/usb/host/ehci-sead3.c | 185 -
drivers/video/fbdev/Kconfig | 2 +-
drivers/video/fbdev/cobalt_lcdfb.c | 42 -
drivers/watchdog/Kconfig | 49 +
drivers/watchdog/Makefile | 8 +-
drivers/watchdog/asm9260_wdt.c | 1 -
drivers/watchdog/bcm7038_wdt.c | 2 +-
drivers/watchdog/cadence_wdt.c | 20 +-
drivers/watchdog/dw_wdt.c | 11 +-
drivers/watchdog/hpwdt.c | 8 +-
drivers/watchdog/iTCO_wdt.c | 2 +-
drivers/watchdog/imx2_wdt.c | 60 +-
drivers/watchdog/kempld_wdt.c | 2 +-
drivers/watchdog/mt7621_wdt.c | 1 -
drivers/watchdog/of_xilinx_wdt.c | 25 +-
drivers/watchdog/pretimeout_noop.c | 47 +
drivers/watchdog/pretimeout_panic.c | 47 +
drivers/watchdog/rn5t618_wdt.c | 2 +-
drivers/watchdog/rt2880_wdt.c | 1 -
drivers/watchdog/softdog.c | 24 +-
drivers/watchdog/st_lpc_wdt.c | 33 -
drivers/watchdog/tegra_wdt.c | 2 +-
drivers/watchdog/txx9wdt.c | 6 +-
drivers/watchdog/w83627hf_wdt.c | 2 +-
drivers/watchdog/watchdog_core.c | 2 +-
drivers/watchdog/watchdog_dev.c | 101 +-
drivers/watchdog/watchdog_pretimeout.c | 220 ++
drivers/watchdog/watchdog_pretimeout.h | 60 +
drivers/watchdog/ziirave_wdt.c | 409 ++-
fs/befs/befs.h | 19 +-
fs/befs/btree.c | 60 +-
fs/befs/datastream.c | 253 +-
fs/befs/debug.c | 1 +
fs/befs/io.c | 26 +-
fs/befs/io.h | 2 -
fs/befs/linuxvfs.c | 130 +-
fs/befs/super.c | 36 +-
fs/btrfs/ctree.h | 3 +-
fs/btrfs/disk-io.c | 33 +-
fs/btrfs/extent_io.c | 64 +-
fs/btrfs/extent_io.h | 22 +
fs/btrfs/free-space-tree.c | 19 +-
fs/btrfs/tests/extent-io-tests.c | 87 +-
fs/btrfs/tests/free-space-tree-tests.c | 189 +-
fs/cifs/cifs_debug.c | 1 +
fs/cifs/cifs_fs_sb.h | 1 +
fs/cifs/cifs_ioctl.h | 8 +
fs/cifs/cifsacl.c | 123 +
fs/cifs/cifsfs.c | 11 +-
fs/cifs/cifsglob.h | 50 +-
fs/cifs/cifsproto.h | 2 +
fs/cifs/cifssmb.c | 4 +-
fs/cifs/connect.c | 43 +-
fs/cifs/file.c | 105 +-
fs/cifs/ioctl.c | 16 +-
fs/cifs/misc.c | 15 +-
fs/cifs/readdir.c | 6 +-
fs/cifs/smb2inode.c | 6 +
fs/cifs/smb2misc.c | 16 +-
fs/cifs/smb2ops.c | 62 +-
fs/cifs/smb2pdu.c | 587 ++--
fs/cifs/smb2pdu.h | 2 +-
fs/cifs/xattr.c | 62 +-
fs/compat_ioctl.c | 2 +
fs/exportfs/expfs.c | 10 +-
fs/kernfs/dir.c | 84 +-
fs/namei.c | 25 +
fs/namespace.c | 1 +
fs/nfs/cache_lib.c | 2 +-
fs/nfs/callback.c | 136 +-
fs/nfs/callback.h | 12 +
fs/nfs/callback_proc.c | 16 +
fs/nfs/callback_xdr.c | 53 +-
fs/nfs/client.c | 10 +-
fs/nfs/delegation.c | 213 +-
fs/nfs/delegation.h | 8 +-
fs/nfs/dir.c | 24 +-
fs/nfs/direct.c | 2 +-
fs/nfs/file.c | 11 +-
fs/nfs/flexfilelayout/flexfilelayout.c | 2 +-
fs/nfs/internal.h | 7 +-
fs/nfs/netns.h | 2 +-
fs/nfs/nfs42proc.c | 1 +
fs/nfs/nfs4_fs.h | 15 +-
fs/nfs/nfs4client.c | 118 +-
fs/nfs/nfs4proc.c | 901 +++--
fs/nfs/nfs4session.h | 2 +
fs/nfs/nfs4state.c | 84 +-
fs/nfs/nfs4xdr.c | 42 +-
fs/nfs/pnfs.c | 73 +-
fs/nfs/pnfs.h | 5 +-
fs/nfs/pnfs_nfs.c | 58 +-
fs/nfs/super.c | 10 +
fs/nfsd/flexfilelayout.c | 1 +
fs/nfsd/netns.h | 1 +
fs/nfsd/nfs4callback.c | 64 +-
fs/nfsd/nfs4layouts.c | 6 +-
fs/nfsd/nfs4proc.c | 90 +-
fs/nfsd/nfs4state.c | 237 +-
fs/nfsd/nfs4xdr.c | 65 +-
fs/nfsd/nfsctl.c | 2 +
fs/nfsd/nfsproc.c | 3 +-
fs/nfsd/nfssvc.c | 18 +-
fs/nfsd/pnfs.h | 1 +
fs/nfsd/state.h | 22 +-
fs/nfsd/vfs.c | 16 +
fs/nfsd/vfs.h | 2 +
fs/nfsd/xdr4.h | 23 +
fs/nfsd/xdr4cb.h | 9 +
fs/open.c | 5 +
fs/overlayfs/copy_up.c | 67 +-
fs/overlayfs/dir.c | 5 +-
fs/overlayfs/inode.c | 44 +-
fs/overlayfs/super.c | 44 +-
fs/read_write.c | 29 +
fs/super.c | 43 +-
fs/sysfs/dir.c | 6 +-
fs/xfs/Makefile | 7 +
fs/xfs/libxfs/xfs_ag_resv.c | 15 +-
fs/xfs/libxfs/xfs_alloc.c | 23 +
fs/xfs/libxfs/xfs_bmap.c | 575 +++-
fs/xfs/libxfs/xfs_bmap.h | 67 +-
fs/xfs/libxfs/xfs_bmap_btree.c | 18 +
fs/xfs/libxfs/xfs_btree.c | 8 +-
fs/xfs/libxfs/xfs_btree.h | 16 +
fs/xfs/libxfs/xfs_defer.h | 2 +
fs/xfs/libxfs/xfs_format.h | 97 +-
fs/xfs/libxfs/xfs_fs.h | 10 +-
fs/xfs/libxfs/xfs_inode_buf.c | 24 +-
fs/xfs/libxfs/xfs_inode_buf.h | 1 +
fs/xfs/libxfs/xfs_inode_fork.c | 70 +-
fs/xfs/libxfs/xfs_inode_fork.h | 28 +-
fs/xfs/libxfs/xfs_log_format.h | 118 +-
fs/xfs/libxfs/xfs_refcount.c | 1698 ++++++++++
fs/xfs/libxfs/xfs_refcount.h | 70 +
fs/xfs/libxfs/xfs_refcount_btree.c | 451 +++
fs/xfs/libxfs/xfs_refcount_btree.h | 74 +
fs/xfs/libxfs/xfs_rmap.c | 1120 +++++-
fs/xfs/libxfs/xfs_rmap.h | 7 +
fs/xfs/libxfs/xfs_rmap_btree.c | 82 +-
fs/xfs/libxfs/xfs_rmap_btree.h | 7 +
fs/xfs/libxfs/xfs_sb.c | 9 +
fs/xfs/libxfs/xfs_shared.h | 2 +
fs/xfs/libxfs/xfs_trans_resv.c | 23 +-
fs/xfs/libxfs/xfs_trans_resv.h | 3 +
fs/xfs/libxfs/xfs_trans_space.h | 9 +
fs/xfs/libxfs/xfs_types.h | 3 +-
fs/xfs/xfs_aops.c | 222 +-
fs/xfs/xfs_aops.h | 4 +-
fs/xfs/xfs_bmap_item.c | 508 +++
fs/xfs/xfs_bmap_item.h | 98 +
fs/xfs/xfs_bmap_util.c | 589 +++-
fs/xfs/xfs_dir2_readdir.c | 3 +-
fs/xfs/xfs_error.h | 10 +-
fs/xfs/xfs_file.c | 221 +-
fs/xfs/xfs_fsops.c | 107 +-
fs/xfs/xfs_fsops.h | 3 +
fs/xfs/xfs_globals.c | 5 +-
fs/xfs/xfs_icache.c | 243 +-
fs/xfs/xfs_icache.h | 7 +
fs/xfs/xfs_inode.c | 51 +
fs/xfs/xfs_inode.h | 19 +
fs/xfs/xfs_inode_item.c | 2 +-
fs/xfs/xfs_ioctl.c | 75 +-
fs/xfs/xfs_iomap.c | 35 +-
fs/xfs/xfs_iomap.h | 3 +-
fs/xfs/xfs_iops.c | 1 +
fs/xfs/xfs_itable.c | 8 +-
fs/xfs/xfs_linux.h | 1 +
fs/xfs/xfs_log_recover.c | 357 ++
fs/xfs/xfs_mount.c | 32 +
fs/xfs/xfs_mount.h | 8 +
fs/xfs/xfs_ondisk.h | 3 +
fs/xfs/xfs_pnfs.c | 7 +
fs/xfs/xfs_refcount_item.c | 539 +++
fs/xfs/xfs_refcount_item.h | 101 +
fs/xfs/xfs_reflink.c | 1688 ++++++++++
fs/xfs/xfs_reflink.h | 58 +
fs/xfs/xfs_rmap_item.c | 12 +
fs/xfs/xfs_stats.c | 1 +
fs/xfs/xfs_stats.h | 18 +-
fs/xfs/xfs_super.c | 87 +
fs/xfs/xfs_sysctl.c | 9 +
fs/xfs/xfs_sysctl.h | 1 +
fs/xfs/xfs_trace.h | 742 +++-
fs/xfs/xfs_trans.h | 29 +
fs/xfs/xfs_trans_bmap.c | 249 ++
fs/xfs/xfs_trans_refcount.c | 264 ++
fs/xfs/xfs_trans_rmap.c | 9 +
include/asm-generic/export.h | 94 +
include/asm-generic/libata-portmap.h | 7 -
include/asm-generic/percpu.h | 53 +-
include/asm-generic/vmlinux.lds.h | 57 +-
include/linux/acpi.h | 22 +-
include/linux/ata.h | 69 +-
include/linux/blk-cgroup.h | 11 +-
include/linux/cgroup.h | 9 +-
include/linux/compiler-gcc.h | 7 +
include/linux/compiler.h | 27 +
include/linux/cpufreq.h | 104 +-
include/linux/export.h | 30 +-
include/linux/exportfs.h | 13 +-
include/linux/falloc.h | 3 +-
include/linux/fdtable.h | 2 +-
include/linux/fs.h | 1 +
include/linux/genhd.h | 2 +-
include/linux/init.h | 43 +-
include/linux/kernfs.h | 28 +-
include/linux/libata.h | 3 +-
include/linux/mlx5/device.h | 13 +-
include/linux/nfs4.h | 1 +
include/linux/nfs_fs_sb.h | 3 +
include/linux/nfs_xdr.h | 8 +-
include/linux/pkeys.h | 1 -
include/linux/random.h | 15 +-
include/linux/sunrpc/auth.h | 1 +
include/linux/sunrpc/clnt.h | 17 +
include/linux/sunrpc/rpc_rdma.h | 39 +
include/linux/sunrpc/sched.h | 4 +-
include/linux/sunrpc/svc_rdma.h | 10 +
include/linux/sunrpc/xdr.h | 12 +
include/linux/sunrpc/xprt.h | 12 +-
include/linux/sunrpc/xprtmultipath.h | 2 +
include/linux/sunrpc/xprtrdma.h | 4 +-
include/linux/watchdog.h | 24 +
include/net/cfg80211.h | 77 +-
include/net/l3mdev.h | 24 +
include/soc/fsl/bman.h | 129 +
include/soc/fsl/qman.h | 1074 ++++++
include/trace/events/cgroup.h | 163 +
include/uapi/linux/btrfs.h | 12 +-
include/uapi/linux/falloc.h | 18 +
include/uapi/linux/fs.h | 4 +-
include/uapi/linux/nfs4.h | 5 +-
include/uapi/linux/pci_regs.h | 3 +
include/uapi/rdma/qedr-abi.h | 106 +
init/Makefile | 2 +
init/main.c | 1 +
kernel/cgroup.c | 75 +-
kernel/cpuset.c | 13 +-
kernel/fork.c | 7 +-
kernel/rcu/tiny.c | 2 +-
kernel/rcu/tree.c | 2 +-
kernel/sched/debug.c | 3 +-
kernel/sched/fair.c | 2 +-
kernel/softirq.c | 4 +-
kernel/time/timer.c | 2 +-
lib/Kconfig.debug | 9 -
lib/iov_iter.c | 22 +
lib/irq_poll.c | 2 +-
lib/percpu-refcount.c | 169 +-
lib/random32.c | 2 +-
mm/page_alloc.c | 5 +
mm/percpu.c | 38 +-
net/bridge/br_sysfs_if.c | 1 +
net/core/dev.c | 4 +-
net/core/rtnetlink.c | 2 +
net/ipv4/route.c | 3 +-
net/ipv6/tcp_ipv6.c | 20 +-
net/openvswitch/flow.c | 2 +-
net/openvswitch/vport-internal_dev.c | 2 +-
net/openvswitch/vport.c | 3 +-
net/sched/act_api.c | 19 +-
net/sched/cls_api.c | 18 +-
net/strparser/strparser.c | 2 +-
net/sunrpc/auth.c | 2 +-
net/sunrpc/auth_generic.c | 9 +
net/sunrpc/auth_gss/auth_gss.c | 7 +
net/sunrpc/auth_unix.c | 9 +
net/sunrpc/backchannel_rqst.c | 8 +-
net/sunrpc/cache.c | 5 +-
net/sunrpc/clnt.c | 132 +-
net/sunrpc/sched.c | 35 +-
net/sunrpc/svc.c | 17 +
net/sunrpc/xdr.c | 11 +-
net/sunrpc/xprt.c | 2 +-
net/sunrpc/xprtmultipath.c | 24 +-
net/sunrpc/xprtrdma/backchannel.c | 53 +-
net/sunrpc/xprtrdma/fmr_ops.c | 7 +-
net/sunrpc/xprtrdma/frwr_ops.c | 28 +-
net/sunrpc/xprtrdma/rpc_rdma.c | 323 +-
net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 21 +-
net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 2 +-
net/sunrpc/xprtrdma/svc_rdma_sendto.c | 82 +-
net/sunrpc/xprtrdma/svc_rdma_transport.c | 60 +-
net/sunrpc/xprtrdma/transport.c | 202 +-
net/sunrpc/xprtrdma/verbs.c | 237 +-
net/sunrpc/xprtrdma/xprt_rdma.h | 108 +-
net/sunrpc/xprtsock.c | 34 +-
net/tipc/udp_media.c | 2 +
samples/Kconfig | 6 +
samples/Makefile | 2 +-
{Documentation => samples}/auxdisplay/.gitignore | 0
samples/auxdisplay/Makefile | 9 +
.../auxdisplay/cfag12864b-example.c | 0
samples/blackfin/Makefile | 1 +
.../blackfin/gptimers-example.c | 0
.../misc-devices => samples}/mei/.gitignore | 0
samples/mei/Makefile | 9 +
{Documentation/misc-devices => samples}/mei/TODO | 0
.../misc-devices => samples}/mei/mei-amt-version.c | 0
{Documentation => samples}/mic/mpssd/.gitignore | 0
samples/mic/mpssd/Makefile | 27 +
{Documentation => samples}/mic/mpssd/micctrl | 0
{Documentation => samples}/mic/mpssd/mpss | 0
{Documentation => samples}/mic/mpssd/mpssd.c | 0
{Documentation => samples}/mic/mpssd/mpssd.h | 0
{Documentation => samples}/mic/mpssd/sysfs.c | 0
{Documentation => samples}/timers/.gitignore | 0
samples/timers/Makefile | 15 +
{Documentation => samples}/timers/hpet_example.c | 0
.../watchdog/src => samples/watchdog}/.gitignore | 1 -
samples/watchdog/Makefile | 8 +
.../src => samples/watchdog}/watchdog-simple.c | 0
scripts/Makefile.build | 43 +-
scripts/Makefile.gcc-plugins | 9 +-
scripts/Makefile.modpost | 14 +-
scripts/basic/fixdep.c | 86 +-
scripts/coccicheck | 2 +-
scripts/coccinelle/api/memdup_user.cocci | 8 +-
scripts/coccinelle/api/pm_runtime.cocci | 18 +-
scripts/coccinelle/misc/cond_no_effect.cocci | 64 +
scripts/gcc-plugins/latent_entropy_plugin.c | 640 ++++
scripts/gen_initramfs_list.sh | 5 +-
scripts/genksyms/lex.l | 35 +-
scripts/genksyms/lex.lex.c_shipped | 35 +-
scripts/link-vmlinux.sh | 71 +-
sound/core/seq/seq_compat.c | 2 +-
sound/pci/hda/dell_wmi_helper.c | 2 +-
sound/pci/hda/thinkpad_helper.c | 2 +-
sound/usb/line6/driver.c | 4 +-
sound/usb/line6/podhd.c | 3 +-
{Documentation => tools}/accounting/.gitignore | 0
tools/accounting/Makefile | 9 +
{Documentation => tools}/accounting/getdelays.c | 0
.../laptops => tools/laptop/dslm}/.gitignore | 0
tools/laptop/dslm/Makefile | 9 +
.../laptops => tools/laptop/dslm}/dslm.c | 0
{Documentation => tools}/pcmcia/.gitignore | 0
tools/pcmcia/Makefile | 9 +
{Documentation => tools}/pcmcia/crc32hash.c | 0
.../testing/selftests}/filesystems/.gitignore | 0
tools/testing/selftests/filesystems/Makefile | 7 +
.../testing/selftests}/filesystems/dnotify_test.c | 0
tools/testing/selftests/futex/functional/run.sh | 2 +-
tools/testing/selftests/futex/run.sh | 2 +-
.../testing/selftests}/ia64/.gitignore | 0
tools/testing/selftests/ia64/Makefile | 8 +
.../testing/selftests}/ia64/aliasing-test.c | 0
.../selftests}/networking/timestamping/.gitignore | 0
.../selftests/networking/timestamping/Makefile | 8 +
.../networking/timestamping/hwtstamp_config.c | 0
.../networking/timestamping/timestamping.c | 0
.../networking/timestamping/txtimestamp.c | 0
.../selftests/powerpc/copyloops/asm/export.h | 1 +
tools/testing/selftests/powerpc/math/.gitignore | 1 +
tools/testing/selftests/powerpc/signal/.gitignore | 2 +
.../selftests/powerpc/stringloops/asm/export.h | 1 +
tools/testing/selftests/powerpc/tm/.gitignore | 4 +
.../testing/selftests}/prctl/.gitignore | 0
tools/testing/selftests/prctl/Makefile | 15 +
.../prctl/disable-tsc-ctxt-sw-stress-test.c | 0
.../prctl/disable-tsc-on-off-stress-test.c | 0
.../testing/selftests}/prctl/disable-tsc-test.c | 0
.../testing/selftests}/ptp/.gitignore | 0
tools/testing/selftests/ptp/Makefile | 8 +
.../testing/selftests}/ptp/testptp.c | 0
.../testing/selftests}/ptp/testptp.mk | 0
tools/testing/selftests/timers/posix_timers.c | 4 +-
.../testing/selftests}/vDSO/.gitignore | 0
tools/testing/selftests/vDSO/Makefile | 20 +
.../testing/selftests}/vDSO/parse_vdso.c | 0
.../selftests}/vDSO/vdso_standalone_test_x86.c | 0
.../testing/selftests}/vDSO/vdso_test.c | 0
tools/testing/selftests/watchdog/.gitignore | 1 +
tools/testing/selftests/watchdog/Makefile | 8 +
.../testing/selftests/watchdog}/watchdog-test.c | 0
tools/testing/selftests/zram/README | 2 +-
1186 files changed, 44370 insertions(+), 12461 deletions(-)
create mode 100644 Documentation/80211/cfg80211.rst
create mode 100644 Documentation/80211/conf.py
create mode 100644 Documentation/80211/index.rst
create mode 100644 Documentation/80211/introduction.rst
create mode 100644 Documentation/80211/mac80211-advanced.rst
create mode 100644 Documentation/80211/mac80211.rst
delete mode 100644 Documentation/DocBook/80211.tmpl
delete mode 100644 Documentation/accounting/Makefile
delete mode 100644 Documentation/auxdisplay/Makefile
delete mode 100644 Documentation/blackfin/Makefile
create mode 100644 Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
create mode 100644 Documentation/devicetree/bindings/input/touchscreen/melfas_mip4.txt
create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx8900.txt
delete mode 100644 Documentation/filesystems/Makefile
delete mode 100644 Documentation/ia64/Makefile
delete mode 100644 Documentation/laptops/Makefile
delete mode 100644 Documentation/mic/Makefile
delete mode 100644 Documentation/mic/mpssd/Makefile
delete mode 100644 Documentation/misc-devices/Makefile
delete mode 100644 Documentation/misc-devices/mei/Makefile
delete mode 100644 Documentation/networking/Makefile
delete mode 100644 Documentation/networking/timestamping/Makefile
delete mode 100644 Documentation/pcmcia/Makefile
delete mode 100644 Documentation/prctl/Makefile
delete mode 100644 Documentation/ptp/Makefile
delete mode 100644 Documentation/timers/Makefile
delete mode 100644 Documentation/vDSO/Makefile
delete mode 100644 Documentation/watchdog/Makefile
delete mode 100644 Documentation/watchdog/src/Makefile
delete mode 100644 arch/alpha/kernel/alpha_ksyms.c
delete mode 100644 arch/arm/kernel/armksyms.c
delete mode 100644 arch/arm/mach-imx/ssi-fiq-ksym.c
create mode 100644 arch/ia64/include/asm/export.h
create mode 100644 arch/m68k/include/asm/export.h
delete mode 100644 arch/m68k/kernel/m68k_ksyms.c
create mode 100644 arch/mips/boot/dts/brcm/bcm3368-netgear-cvg834g.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm3368.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm63268-comtrend-vr-3032u.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm63268.dtsi
rename arch/mips/boot/dts/brcm/{bcm96358nb4ser.dts => bcm6358-neufbox4-sercomm.dts} (94%)
create mode 100644 arch/mips/boot/dts/brcm/bcm6362-neufbox6-sercomm.dts
create mode 100644 arch/mips/boot/dts/brcm/bcm6362.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch24.dtsi
create mode 100644 arch/mips/boot/dts/brcm/bcm97xxx-nand-cs1-bch4.dtsi
create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n-1000n.dtsi
create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts
create mode 100644 arch/mips/configs/generic/32r1.config
create mode 100644 arch/mips/configs/generic/32r2.config
create mode 100644 arch/mips/configs/generic/32r6.config
create mode 100644 arch/mips/configs/generic/64r1.config
create mode 100644 arch/mips/configs/generic/64r2.config
create mode 100644 arch/mips/configs/generic/64r6.config
create mode 100644 arch/mips/configs/generic/board-sead-3.config
create mode 100644 arch/mips/configs/generic/eb.config
create mode 100644 arch/mips/configs/generic/el.config
create mode 100644 arch/mips/configs/generic/micro32r2.config
create mode 100644 arch/mips/configs/generic_defconfig
create mode 100644 arch/mips/configs/loongson1c_defconfig
delete mode 100644 arch/mips/configs/sead3_defconfig
delete mode 100644 arch/mips/configs/sead3micro_defconfig
create mode 100644 arch/mips/generic/Kconfig
create mode 100644 arch/mips/generic/Makefile
create mode 100644 arch/mips/generic/Platform
create mode 100644 arch/mips/generic/board-sead3.c
create mode 100644 arch/mips/generic/init.c
create mode 100644 arch/mips/generic/irq.c
create mode 100644 arch/mips/generic/proc.c
create mode 100644 arch/mips/generic/vmlinux.its.S
delete mode 100644 arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h
delete mode 100644 arch/mips/include/asm/mach-sead3/irq.h
delete mode 100644 arch/mips/include/asm/mach-sead3/kernel-entry-init.h
delete mode 100644 arch/mips/include/asm/mach-sead3/war.h
create mode 100644 arch/mips/include/asm/machine.h
delete mode 100644 arch/mips/include/asm/mips-boards/sead3int.h
delete mode 100644 arch/mips/include/asm/octeon/cvmx-mdio.h
create mode 100644 arch/mips/kernel/probes-common.h
delete mode 100644 arch/mips/kernel/smp-gic.c
create mode 100644 arch/mips/loongson32/ls1c/Makefile
create mode 100644 arch/mips/loongson32/ls1c/board.c
delete mode 100644 arch/mips/mti-sead3/Makefile
delete mode 100644 arch/mips/mti-sead3/Platform
delete mode 100644 arch/mips/mti-sead3/sead3-console.c
delete mode 100644 arch/mips/mti-sead3/sead3-display.c
delete mode 100644 arch/mips/mti-sead3/sead3-init.c
delete mode 100644 arch/mips/mti-sead3/sead3-int.c
delete mode 100644 arch/mips/mti-sead3/sead3-lcd.c
delete mode 100644 arch/mips/mti-sead3/sead3-platform.c
delete mode 100644 arch/mips/mti-sead3/sead3-reset.c
delete mode 100644 arch/mips/mti-sead3/sead3-setup.c
delete mode 100644 arch/mips/mti-sead3/sead3-time.c
create mode 100644 arch/mips/pci/pci-generic.c
create mode 100644 arch/mips/pci/pci-legacy.c
create mode 100644 arch/powerpc/configs/dpaa.config
delete mode 100644 arch/powerpc/kernel/ppc_ksyms.c
delete mode 100644 arch/powerpc/kernel/ppc_ksyms_32.c
delete mode 100644 arch/powerpc/lib/ppc_ksyms.c
delete mode 100644 arch/s390/kernel/s390_ksyms.c
create mode 100644 arch/sparc/kernel/sparc_ksyms.c
delete mode 100644 arch/sparc/kernel/sparc_ksyms_32.c
delete mode 100644 arch/sparc/kernel/sparc_ksyms_64.c
delete mode 100644 arch/sparc/lib/ksyms.c
create mode 100644 arch/x86/include/asm/export.h
delete mode 100644 arch/x86/kernel/i386_ksyms_32.c
delete mode 100644 arch/x86/kernel/x8664_ksyms_64.c
delete mode 100644 arch/x86/um/ksyms.c
create mode 100644 drivers/auxdisplay/img-ascii-lcd.c
create mode 100644 drivers/infiniband/hw/qedr/Kconfig
create mode 100644 drivers/infiniband/hw/qedr/Makefile
create mode 100644 drivers/infiniband/hw/qedr/main.c
create mode 100644 drivers/infiniband/hw/qedr/qedr.h
create mode 100644 drivers/infiniband/hw/qedr/qedr_cm.c
create mode 100644 drivers/infiniband/hw/qedr/qedr_cm.h
create mode 100644 drivers/infiniband/hw/qedr/qedr_hsi.h
create mode 100644 drivers/infiniband/hw/qedr/qedr_hsi_rdma.h
create mode 100644 drivers/infiniband/hw/qedr/verbs.c
create mode 100644 drivers/infiniband/hw/qedr/verbs.h
delete mode 100644 drivers/rtc/rtc-isl12057.c
create mode 100644 drivers/soc/fsl/qbman/Kconfig
create mode 100644 drivers/soc/fsl/qbman/Makefile
create mode 100644 drivers/soc/fsl/qbman/bman.c
create mode 100644 drivers/soc/fsl/qbman/bman_ccsr.c
create mode 100644 drivers/soc/fsl/qbman/bman_portal.c
create mode 100644 drivers/soc/fsl/qbman/bman_priv.h
create mode 100644 drivers/soc/fsl/qbman/bman_test.c
create mode 100644 drivers/soc/fsl/qbman/bman_test.h
create mode 100644 drivers/soc/fsl/qbman/bman_test_api.c
create mode 100644 drivers/soc/fsl/qbman/dpaa_sys.h
create mode 100644 drivers/soc/fsl/qbman/qman.c
create mode 100644 drivers/soc/fsl/qbman/qman_ccsr.c
create mode 100644 drivers/soc/fsl/qbman/qman_portal.c
create mode 100644 drivers/soc/fsl/qbman/qman_priv.h
create mode 100644 drivers/soc/fsl/qbman/qman_test.c
create mode 100644 drivers/soc/fsl/qbman/qman_test.h
create mode 100644 drivers/soc/fsl/qbman/qman_test_api.c
create mode 100644 drivers/soc/fsl/qbman/qman_test_stash.c
delete mode 100644 drivers/usb/host/ehci-sead3.c
create mode 100644 drivers/watchdog/pretimeout_noop.c
create mode 100644 drivers/watchdog/pretimeout_panic.c
create mode 100644 drivers/watchdog/watchdog_pretimeout.c
create mode 100644 drivers/watchdog/watchdog_pretimeout.h
create mode 100644 fs/xfs/libxfs/xfs_refcount.c
create mode 100644 fs/xfs/libxfs/xfs_refcount.h
create mode 100644 fs/xfs/libxfs/xfs_refcount_btree.c
create mode 100644 fs/xfs/libxfs/xfs_refcount_btree.h
create mode 100644 fs/xfs/xfs_bmap_item.c
create mode 100644 fs/xfs/xfs_bmap_item.h
create mode 100644 fs/xfs/xfs_refcount_item.c
create mode 100644 fs/xfs/xfs_refcount_item.h
create mode 100644 fs/xfs/xfs_reflink.c
create mode 100644 fs/xfs/xfs_reflink.h
create mode 100644 fs/xfs/xfs_trans_bmap.c
create mode 100644 fs/xfs/xfs_trans_refcount.c
create mode 100644 include/asm-generic/export.h
delete mode 100644 include/asm-generic/libata-portmap.h
create mode 100644 include/soc/fsl/bman.h
create mode 100644 include/soc/fsl/qman.h
create mode 100644 include/trace/events/cgroup.h
create mode 100644 include/uapi/rdma/qedr-abi.h
rename {Documentation => samples}/auxdisplay/.gitignore (100%)
create mode 100644 samples/auxdisplay/Makefile
rename {Documentation => samples}/auxdisplay/cfag12864b-example.c (100%)
create mode 100644 samples/blackfin/Makefile
rename {Documentation => samples}/blackfin/gptimers-example.c (100%)
rename {Documentation/misc-devices => samples}/mei/.gitignore (100%)
create mode 100644 samples/mei/Makefile
rename {Documentation/misc-devices => samples}/mei/TODO (100%)
rename {Documentation/misc-devices => samples}/mei/mei-amt-version.c (100%)
rename {Documentation => samples}/mic/mpssd/.gitignore (100%)
create mode 100644 samples/mic/mpssd/Makefile
rename {Documentation => samples}/mic/mpssd/micctrl (100%)
rename {Documentation => samples}/mic/mpssd/mpss (100%)
rename {Documentation => samples}/mic/mpssd/mpssd.c (100%)
rename {Documentation => samples}/mic/mpssd/mpssd.h (100%)
rename {Documentation => samples}/mic/mpssd/sysfs.c (100%)
rename {Documentation => samples}/timers/.gitignore (100%)
create mode 100644 samples/timers/Makefile
rename {Documentation => samples}/timers/hpet_example.c (100%)
rename {Documentation/watchdog/src => samples/watchdog}/.gitignore (53%)
create mode 100644 samples/watchdog/Makefile
rename {Documentation/watchdog/src => samples/watchdog}/watchdog-simple.c (100%)
create mode 100644 scripts/coccinelle/misc/cond_no_effect.cocci
create mode 100644 scripts/gcc-plugins/latent_entropy_plugin.c
rename {Documentation => tools}/accounting/.gitignore (100%)
create mode 100644 tools/accounting/Makefile
rename {Documentation => tools}/accounting/getdelays.c (100%)
rename {Documentation/laptops => tools/laptop/dslm}/.gitignore (100%)
create mode 100644 tools/laptop/dslm/Makefile
rename {Documentation/laptops => tools/laptop/dslm}/dslm.c (100%)
rename {Documentation => tools}/pcmcia/.gitignore (100%)
create mode 100644 tools/pcmcia/Makefile
rename {Documentation => tools}/pcmcia/crc32hash.c (100%)
rename {Documentation => tools/testing/selftests}/filesystems/.gitignore (100%)
create mode 100644 tools/testing/selftests/filesystems/Makefile
rename {Documentation => tools/testing/selftests}/filesystems/dnotify_test.c (100%)
rename {Documentation => tools/testing/selftests}/ia64/.gitignore (100%)
create mode 100644 tools/testing/selftests/ia64/Makefile
rename {Documentation => tools/testing/selftests}/ia64/aliasing-test.c (100%)
rename {Documentation => tools/testing/selftests}/networking/timestamping/.gitignore (100%)
create mode 100644 tools/testing/selftests/networking/timestamping/Makefile
rename {Documentation => tools/testing/selftests}/networking/timestamping/hwtstamp_config.c (100%)
rename {Documentation => tools/testing/selftests}/networking/timestamping/timestamping.c (100%)
rename {Documentation => tools/testing/selftests}/networking/timestamping/txtimestamp.c (100%)
create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/export.h
create mode 100644 tools/testing/selftests/powerpc/signal/.gitignore
create mode 100644 tools/testing/selftests/powerpc/stringloops/asm/export.h
rename {Documentation => tools/testing/selftests}/prctl/.gitignore (100%)
create mode 100644 tools/testing/selftests/prctl/Makefile
rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-ctxt-sw-stress-test.c (100%)
rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-on-off-stress-test.c (100%)
rename {Documentation => tools/testing/selftests}/prctl/disable-tsc-test.c (100%)
rename {Documentation => tools/testing/selftests}/ptp/.gitignore (100%)
create mode 100644 tools/testing/selftests/ptp/Makefile
rename {Documentation => tools/testing/selftests}/ptp/testptp.c (100%)
rename {Documentation => tools/testing/selftests}/ptp/testptp.mk (100%)
rename {Documentation => tools/testing/selftests}/vDSO/.gitignore (100%)
create mode 100644 tools/testing/selftests/vDSO/Makefile
rename {Documentation => tools/testing/selftests}/vDSO/parse_vdso.c (100%)
rename {Documentation => tools/testing/selftests}/vDSO/vdso_standalone_test_x86.c (100%)
rename {Documentation => tools/testing/selftests}/vDSO/vdso_test.c (100%)
create mode 100644 tools/testing/selftests/watchdog/.gitignore
create mode 100644 tools/testing/selftests/watchdog/Makefile
rename {Documentation/watchdog/src => tools/testing/selftests/watchdog}/watchdog-test.c (100%)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (d3e2773c4ede builddeb: Skip gcc-plugins when not configured)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
arch/arc/Kconfig | 19 +++++++++++--------
arch/arc/boot/Makefile | 16 ++++++++++++++--
arch/arc/include/asm/mcip.h | 16 ++++++++++++++++
arch/arc/kernel/mcip.c | 31 +++++++++++--------------------
4 files changed, 52 insertions(+), 30 deletions(-)
Merging arm-current/fixes (fb833b1fbb68 ARM: fix delays)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (b79331a5eb9f powerpc/powernv/pci: Fix m64 checks for SR-IOV and window alignment)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging sparc/master (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
$ git merge sparc/master
Already up-to-date.
Merging net/master (9e55d0f95460 Merge tag 'wireless-drivers-for-davem-2016-10-14' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers)
$ git merge net/master
Recorded preimage for 'drivers/net/ethernet/qlogic/Kconfig'
Auto-merging drivers/net/ethernet/qlogic/Kconfig
CONFLICT (content): Merge conflict in drivers/net/ethernet/qlogic/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'drivers/net/ethernet/qlogic/Kconfig'.
[master 149be3e47372] Merge remote-tracking branch 'net/master'
$ git diff -M --stat --summary HEAD^..
Documentation/networking/netdev-FAQ.txt | 8 +-
drivers/infiniband/ulp/ipoib/ipoib.h | 20 +-
drivers/infiniband/ulp/ipoib/ipoib_cm.c | 15 +-
drivers/infiniband/ulp/ipoib/ipoib_ib.c | 12 +-
drivers/infiniband/ulp/ipoib/ipoib_main.c | 54 ++++--
drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +-
drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +-
drivers/net/ethernet/qlogic/Kconfig | 3 +
drivers/net/ethernet/qlogic/qed/Makefile | 2 +-
drivers/net/ethernet/qlogic/qed/qed_cxt.c | 15 +-
drivers/net/ethernet/qlogic/qed/qed_debug.c | 53 ++---
drivers/net/ethernet/qlogic/qed/qed_dev.c | 19 +-
drivers/net/ethernet/qlogic/qed/qed_ll2.c | 16 +-
drivers/net/ethernet/qlogic/qed/qed_ll2.h | 20 --
drivers/net/ethernet/qlogic/qed/qed_main.c | 30 ++-
drivers/net/ethernet/qlogic/qed/qed_roce.c | 216 ++++++---------------
drivers/net/ethernet/qlogic/qed/qed_roce.h | 95 +++++----
drivers/net/ethernet/qlogic/qed/qed_sp.h | 1 -
drivers/net/ethernet/qlogic/qed/qed_spq.c | 4 -
drivers/net/ethernet/qlogic/qede/Makefile | 2 +-
drivers/net/usb/asix_common.c | 8 +-
drivers/net/wan/Kconfig | 2 +-
drivers/net/wan/slic_ds26522.c | 8 +
drivers/net/wireless/ath/ath10k/core.h | 1 +
drivers/net/wireless/ath/ath10k/debug.c | 75 +++----
drivers/net/wireless/ath/ath6kl/sdio.c | 1 +
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 25 +--
drivers/net/wireless/ath/ath9k/hw.h | 1 -
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 4 +-
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 8 +-
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 +
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 11 +-
drivers/net/wireless/realtek/rtlwifi/core.c | 2 +-
.../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 8 +-
.../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 13 +-
.../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 12 +-
.../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 6 +-
.../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 8 +-
.../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 9 +-
.../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 12 +-
.../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 6 +-
.../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 18 +-
drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 -
drivers/net/wireless/ti/wlcore/sdio.c | 1 -
fs/afs/cmservice.c | 6 +-
fs/afs/fsclient.c | 4 +-
fs/afs/internal.h | 2 +-
fs/afs/rxrpc.c | 3 +-
include/linux/qed/qede_roce.h | 2 +-
include/net/if_inet6.h | 2 +-
include/uapi/linux/ethtool.h | 3 +-
net/ipv6/addrconf.c | 102 ++++------
net/ipv6/ip6_tunnel.c | 2 +
net/rxrpc/call_object.c | 2 +-
net/rxrpc/peer_object.c | 4 +-
55 files changed, 433 insertions(+), 545 deletions(-)
$ git am -3 ../patches/0001-qed-merge-fix-for-CONFIG_INFINIBAND_QEDR-Kconfig-mov.patch
Applying: qed*: merge fix for CONFIG_INFINIBAND_QEDR Kconfig move
$ git reset HEAD^
Unstaged changes after reset:
M drivers/infiniband/hw/qedr/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master ce49d6f4de1c] Merge remote-tracking branch 'net/master'
Date: Sun Oct 16 08:08:12 2016 +1100
Merging ipsec/master (7f92083eb58f vti6: flush x-netns xfrm cache when vti interface is removed)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
net/ipv6/ip6_vti.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
Merging netfilter/master (6d3a4c404648 strparser: Propagate correct error code in strp_recv())
$ git merge netfilter/master
Already up-to-date.
Merging ipvs/master (ea43f860d984 Merge branch 'ethoc-fixes')
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (1ea2643961b0 ath6kl: add Dell OEM SDIO I/O for the Venue 8 Pro)
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (1d4de2e222b4 mac80211: fix CMD_FRAME for AP_VLAN)
$ git merge mac80211/master
Auto-merging include/net/cfg80211.h
Merge made by the 'recursive' strategy.
.../net/wireless/marvell/mwifiex/11n_rxreorder.c | 2 +-
include/net/cfg80211.h | 32 ++++++++++----
net/mac80211/offchannel.c | 2 +-
net/mac80211/rx.c | 51 +++++++++++++++++-----
net/wireless/util.c | 34 +++++++--------
5 files changed, 82 insertions(+), 39 deletions(-)
Merging sound-current/for-linus (fdd8218d7d1b ALSA: line6: fix a crash in line6_hwdep_write())
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (035ee288ae7a PCI: Fix bridge_d3 update on device removal)
$ git merge pci-current/for-linus
Already up-to-date.
Merging driver-core.current/driver-core-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (d8a4100ddc75 usb: gadget: udc: atmel: fix endpoint name)
$ git merge usb-gadget-fixes/fixes
Merge made by the 'recursive' strategy.
drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging usb-serial-fixes/usb-linus (f190fd92458d USB: serial: simple: add support for another Infineon flashloader)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging usb-chipidea-fixes/ci-for-usb-stable (6b7f456e67a1 usb: chipidea: host: fix NULL ptr dereference during shutdown)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Auto-merging drivers/usb/chipidea/host.c
Merge made by the 'recursive' strategy.
drivers/usb/chipidea/host.c | 2 ++
1 file changed, 2 insertions(+)
Merging staging.current/staging-linus (29fbff8698fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (1134ca268e73 Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (c3afafa47898 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (797cee982eef Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit)
$ git merge ide/master
Already up-to-date.
Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging vfio-fixes/for-linus (c8952a707556 vfio/pci: Fix NULL pointer oops in error interrupt setup handling)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (29b4817d4018 Linux 4.8-rc1)
$ git merge kselftest-fixes/fixes
Already up-to-date.
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
$ git merge backlight-fixes/for-backlight-fixes
Already up-to-date.
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
$ git merge ftrace-fixes/for-next-urgent
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (5baaf3b9efe1 usb: dwc3: st: Use explicit reset_control_get_exclusive() API)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (c8d2bc9bc39e Linux 4.8)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging kbuild/for-next (fbcbee25745d Merge branches 'kbuild/kbuild' and 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
$ git merge asm-generic/master
Resolved 'include/asm-generic/percpu.h' using previous resolution.
Auto-merging include/asm-generic/percpu.h
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5b2f5c9ccebf] Merge remote-tracking branch 'asm-generic/master'
$ git diff -M --stat --summary HEAD^..
include/asm-generic/page.h | 2 +-
include/asm-generic/percpu.h | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Merging arc/for-next (8df0cc75f530 ARC: [build] Support gz, lzma compressed uImage)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (70fe0fd28524 Merge branch 'fixes' into for-next)
$ git merge arm/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm-perf/for-next/perf (694d0d0bb203 Linux 4.8-rc2)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (bcaf9dcf55fd ARM: SoC: Document merges)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
arch/arm/arm-soc-for-next-contents.txt | 246 +++++++++++++++++++++
arch/arm/mach-mvebu/Kconfig | 4 +-
.../boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
3 files changed, 248 insertions(+), 4 deletions(-)
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging pinctrl/for-next (6d475e0b3980 pinctrl: baytrail: Fix lockdep)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 4 +-
drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 100 +++++++++++++++++----
drivers/pinctrl/aspeed/pinctrl-aspeed.c | 12 +--
drivers/pinctrl/berlin/berlin.c | 12 ++-
drivers/pinctrl/intel/pinctrl-baytrail.c | 3 +-
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 12 ++-
6 files changed, 115 insertions(+), 28 deletions(-)
Merging amlogic/for-next (8148ca0d95ec Merge branch 'v4.8/dt64-2' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
Merging at91/at91-next (0f59c948faed Merge tag 'at91-ab-4.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging bcm2835/for-next (9336be5db24d Merge branch anholt/bcm2835-dt-next into for-next)
$ git merge bcm2835/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (70da51e698c7 Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging keystone/next (fb2a68db621a Merge branch 'for_4.9/keystone_dts' into next)
$ git merge keystone/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging mvebu/for-next (a9c51ff3121f Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Removing arch/arm/mach-orion5x/wnr854t-setup.c
Merge made by the 'recursive' strategy.
arch/arm/configs/multi_v5_defconfig | 2 +-
arch/arm/configs/mvebu_v5_defconfig | 2 +-
arch/arm/configs/orion5x_defconfig | 2 +-
arch/arm/mach-orion5x/Kconfig | 4 +-
arch/arm/mach-orion5x/Makefile | 2 +-
arch/arm/mach-orion5x/board-wnr854t.c | 78 ++++++++++++++
arch/arm/mach-orion5x/wnr854t-setup.c | 185 ----------------------------------
7 files changed, 84 insertions(+), 191 deletions(-)
create mode 100644 arch/arm/mach-orion5x/board-wnr854t.c
delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c
Merging omap/for-next (624018387bcf Merge branch 'omap-for-v4.9/dt-v2' into for-next)
$ git merge omap/for-next
Merge made by the 'recursive' strategy.
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
$ git merge omap-pending/for-next
Already up-to-date.
Merging qcom/for-next (4feeec0c6e6d Merge tag 'qcom-arm64-defconfig-for-4.9' into all-for-4.8)
$ git merge qcom/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging renesas/next (a64ca8158b21 Merge branches 'fixes-for-v4.8', 'arm64-defconfig-for-v4.9', 'arm64-dt-for-v4.9', 'defconfig-for-v4.9', 'dt-for-v4.9' and 'soc-for-v4.9' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
arch/arm/configs/shmobile_defconfig | 1 +
1 file changed, 1 insertion(+)
Merging rockchip/for-next (e80be333a38f Merge branch 'v4.9-armsoc/dts32' into for-next)
$ git merge rockchip/for-next
Auto-merging arch/arm64/boot/dts/rockchip/rk3368.dtsi
Auto-merging arch/arm/boot/dts/rk3xxx.dtsi
Auto-merging arch/arm/boot/dts/rk3288.dtsi
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/rk3036-evb.dts | 2 +-
arch/arm/boot/dts/rk3036-kylin.dts | 2 +-
arch/arm/boot/dts/rk3036.dtsi | 4 +++-
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 +-
arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +-
arch/arm/boot/dts/rk3066a-rayeager.dts | 2 +-
arch/arm/boot/dts/rk3188-radxarock.dts | 2 +-
arch/arm/boot/dts/rk3228-evb.dts | 2 +-
arch/arm/boot/dts/rk3229-evb.dts | 2 +-
arch/arm/boot/dts/rk322x.dtsi | 4 +++-
arch/arm/boot/dts/rk3288-evb.dtsi | 2 +-
arch/arm/boot/dts/rk3288-fennec.dts | 2 +-
arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 2 +-
arch/arm/boot/dts/rk3288-firefly.dtsi | 2 +-
arch/arm/boot/dts/rk3288-miqi.dts | 2 +-
arch/arm/boot/dts/rk3288-popmetal.dts | 2 +-
arch/arm/boot/dts/rk3288-r89.dts | 2 +-
arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
arch/arm/boot/dts/rk3288-veyron.dtsi | 2 +-
arch/arm/boot/dts/rk3288.dtsi | 4 +++-
arch/arm/boot/dts/rk3xxx.dtsi | 4 +++-
arch/arm64/boot/dts/rockchip/rk3368.dtsi | 12 ++++++------
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 ++
23 files changed, 37 insertions(+), 27 deletions(-)
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (1a695a905c18 Linux 4.7-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (ea24fc2674ef Merge branch 'next/dt' into for-next)
$ git merge samsung-krzk/for-next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/exynos4x12.dtsi | 2 +-
arch/arm/boot/dts/exynos5410-odroidxu.dts | 69 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 9 ++++
arch/arm/boot/dts/exynos5410.dtsi | 59 ++++++++++++++++++++++++++
4 files changed, 138 insertions(+), 1 deletion(-)
Merging tegra/for-next (74e8115883f5 Merge branch for-4.9/arm64/dt into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
drivers/clk/tegra/clk-tegra-pmc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging arm64/for-next/core (db68f3e7594a arm64: tlbflush.h: add __tlbi() macro)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution.
Auto-merging arch/blackfin/mach-common/pm.c
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 78756665e5ab] Merge remote-tracking branch 'blackfin/for-linus'
$ git diff -M --stat --summary HEAD^..
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (2dc024e94578 cris: return of class_create should be considered)
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (6736e65effc3 m68k: Migrate exception table users off module.h and onto extable.h)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (742859adc721 m68k: let clk_disable() return immediately if clk is NULL)
$ git merge m68knommu/for-next
Already up-to-date.
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (38b876746212 Documentation: MIPS supports HAVE_REGS_AND_STACK_ACCESS_API)
$ git merge mips/mips-for-linux-next
Already up-to-date.
Merging nios2/for-next (476080a79367 nios2: use of_property_read_bool)
$ git merge nios2/for-next
Already up-to-date.
Merging parisc-hd/for-next (c8d2bc9bc39e Linux 4.8)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (08bf75ba852e powerpc/mm/hash64: Fix might_have_hea() check)
$ git merge powerpc/next
Already up-to-date.
Merging fsl/next (e0b80f00bb96 arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (e301f1156450 s390/mm: use hugetlb_bad_size())
$ git merge s390/features
Merge made by the 'recursive' strategy.
arch/s390/include/asm/unistd.h | 3 +++
arch/s390/mm/hugetlbpage.c | 1 +
drivers/s390/block/dasd.c | 16 ++++++++--------
drivers/s390/block/dasd_eckd.c | 4 ++--
drivers/s390/cio/chp.c | 6 ++++--
5 files changed, 18 insertions(+), 12 deletions(-)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
$ git merge sh/for-next
Already up-to-date.
Merging tile/master (bf55d575234b tile: migrate exception table users off module.h and onto extable.h)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/kernel/module.c | 11 +++++------
arch/tile/kernel/pci_gx.c | 2 +-
arch/tile/kernel/unaligned.c | 2 +-
arch/tile/lib/cacheflush.c | 8 +-------
arch/tile/mm/extable.c | 2 +-
arch/tile/mm/fault.c | 2 +-
6 files changed, 10 insertions(+), 17 deletions(-)
Merging uml/linux-next (dad223284407 um: Don't discard .text.exit section)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (1ace5d1e3d4b unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Merge made by the 'recursive' strategy.
arch/unicore32/Kconfig | 14 +
arch/unicore32/include/asm/Kbuild | 3 -
arch/unicore32/include/asm/signal.h | 21 +
arch/unicore32/include/asm/syscalls.h | 25 +
arch/unicore32/include/uapi/asm/sigcontext.h | 14 +
arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++
arch/unicore32/include/uapi/asm/stat.h | 19 +
arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
arch/unicore32/include/uapi/asm/unistd.h | 8 +
arch/unicore32/kernel/entry.S | 17 +
arch/unicore32/kernel/signal.c | 41 ++
11 files changed, 1000 insertions(+), 3 deletions(-)
create mode 100644 arch/unicore32/include/asm/signal.h
create mode 100644 arch/unicore32/include/asm/syscalls.h
create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
create mode 100644 arch/unicore32/include/uapi/asm/stat.h
create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
Merging xtensa/xtensa-for-next (a4c6be5ad1d0 xtensa: disable MMU initialization option on MMUv2 cores)
$ git merge xtensa/xtensa-for-next
Already up-to-date.
Merging befs/for-next (a17e7d2010b4 befs: befs: fix style issues in datastream.c)
$ git merge befs/for-next
Already up-to-date.
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
$ git merge btrfs/next
Already up-to-date.
Merging btrfs-kdave/for-next (54ce19f68430 Merge branch 'for-next-next-4.9-20161012' into for-next-20161012)
$ git merge btrfs-kdave/for-next
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/btrfs/ctree.h
Merge made by the 'recursive' strategy.
fs/btrfs/ctree.h | 2 +-
fs/btrfs/disk-io.c | 13 ++++-----
fs/btrfs/extent-tree.c | 75 ++++++++++++++++++++++++++++++++++++--------------
fs/btrfs/file.c | 1 -
fs/btrfs/inode.c | 11 ++++++--
fs/btrfs/ioctl.c | 1 -
fs/btrfs/relocation.c | 9 +++++-
fs/btrfs/super.c | 4 ---
fs/btrfs/uuid-tree.c | 8 ++++--
fs/btrfs/volumes.c | 42 ++++++++++++++--------------
10 files changed, 104 insertions(+), 62 deletions(-)
Merging ceph/master (f17e583f8d4a ceph: fix error handling in ceph_read_iter)
$ git merge ceph/master
Auto-merging fs/ceph/file.c
Merge made by the 'recursive' strategy.
drivers/block/rbd.c | 50 +++++++++++++++++++++++++++++++++-----------------
fs/ceph/file.c | 3 ++-
2 files changed, 35 insertions(+), 18 deletions(-)
Merging cifs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge cifs/for-next
Already up-to-date.
Merging configfs/for-next (42857cf512cb configfs: Return -EFBIG from configfs_write_bin_file.)
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
fs/ecryptfs/crypto.c | 15 ---------------
fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++-
fs/ecryptfs/keystore.c | 2 +-
fs/ecryptfs/main.c | 2 +-
fs/ecryptfs/miscdev.c | 2 +-
5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (6ed47823005f isofs: Do not return EACCES for unknown filesystems)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
fs/isofs/inode.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
Merging ext4/dev (d74f3d25289a ext4: add missing KERN_CONT to a few more debugging uses)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
fs/crypto/crypto.c | 15 ++++++++-------
fs/crypto/policy.c | 4 ++++
fs/ext4/block_validity.c | 4 ++--
fs/ext4/mballoc.h | 17 ++++++++---------
fs/ext4/namei.c | 18 ++++++++++--------
fs/ext4/super.c | 21 +++++++++++----------
fs/ext4/sysfs.c | 4 ++++
fs/ext4/xattr.c | 20 +++++++-------------
fs/jbd2/transaction.c | 3 ++-
9 files changed, 56 insertions(+), 50 deletions(-)
Merging f2fs/dev (4c1fad64eff4 Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs)
$ git merge f2fs/dev
Already up-to-date.
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
$ git merge freevxfs/for-next
Already up-to-date.
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
$ git merge fscache/fscache
Already up-to-date.
Merging fuse/for-next (63401ccdb2ca fuse: limit xattr returned size)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (a3443cda5588 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security)
$ git merge gfs2/for-next
Already up-to-date.
Merging jfs/jfs-next (240c5185c52d jfs: Simplify code)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (4d2899d73c47 Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (29ae7f9dc21a NFSD: Implement the COPY call)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging orangefs/for-next (f60fbdbf41c8 Revert "orangefs: bump minimum userspace version")
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (7764235becf3 ovl: use vfs_get_link())
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (ec037dfcc064 UBIFS: improve function-level documentation)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (feac470e3642 xfs: convert COW blocks to real blocks before unwritten extent conversion)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (d67fd44f697d locks: Filter /proc/locks output on proc pid ns)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (b26b5ef5ec7e Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge vfs/for-next
Already up-to-date.
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
Merging vfs-miklos/next (c8d2bc9bc39e Linux 4.8)
$ git merge vfs-miklos/next
Already up-to-date.
Merging pci/next (217c6d21e924 Merge branches 'pci/host-armada', 'pci/host-artpec', 'pci/host-dra7xx', 'pci/host-exynos', 'pci/host-hisi', 'pci/host-imx6', 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-qcom' and 'pci/host-spear' into next)
$ git merge pci/next
Already up-to-date.
Merging pstore/for-next/pstore (f88baf68ebe5 ramoops: move spin_lock_init after kmalloc error checking)
$ git merge pstore/for-next/pstore
Already up-to-date.
Merging hid/for-next (419c103f0833 Merge branch 'for-4.9/upstream' into for-next)
$ git merge hid/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (b2edcdae3d9a Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into i2c/for-next)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (c8d2bc9bc39e Linux 4.8)
$ git merge dmi/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (7ce4190c4ca4 hwmon: (nct6775) Add support for multiple virtual temperature sources)
$ git merge hwmon-staging/hwmon-next
Already up-to-date.
Merging jc_docs/docs-next (8c67e73f1884 Merge branch 'doc/4.9' into docs-next)
$ git merge jc_docs/docs-next
Resolved 'Documentation/sphinx-static/theme_overrides.css' using previous resolution.
Auto-merging Documentation/sphinx-static/theme_overrides.css
CONFLICT (content): Merge conflict in Documentation/sphinx-static/theme_overrides.css
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d78eb7eebe2b] Merge remote-tracking branch 'jc_docs/docs-next'
$ git diff -M --stat --summary HEAD^..
Merging v4l-dvb/master (02a628e5c024 Merge branch 'v4l_for_linus' into to_next)
$ git merge v4l-dvb/master
Merge made by the 'recursive' strategy.
Merging pm/linux-next (a4227592e8b4 Merge branch 'acpi' into linux-next)
$ git merge pm/linux-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging idle/next (f55532a0c0b8 Linux 4.6-rc1)
$ git merge idle/next
Already up-to-date.
Merging thermal/next (43720df96023 thermal: int3403: Process trip change notification)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (c6935931c189 Linux 4.8-rc5)
$ git merge thermal-soc/next
Already up-to-date.
Merging ieee1394/for-next (6449e31ddebd firewire: nosy: do not ignore errors in ioremap_nocache())
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
drivers/firewire/nosy.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Merging dlm/next (5c93f56f770e dlm: Use kmemdup instead of kmalloc and memcpy)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging net-next/master (02dc7658c711 Merge branch 'fjes-next')
$ git merge net-next/master
Auto-merging net/core/dev.c
Removing include/dt-bindings/net/mscc-phy-vsc8531.h
Auto-merging drivers/net/ethernet/qlogic/qed/qed_spq.c
Auto-merging drivers/net/ethernet/qlogic/qed/qed_sp.h
Merge made by the 'recursive' strategy.
.../devicetree/bindings/net/mscc-phy-vsc8531.txt | 51 +--
arch/arm64/configs/defconfig | 1 +
arch/m68k/emu/nfeth.c | 1 -
drivers/isdn/hysdn/hysdn_net.c | 1 -
drivers/media/dvb-core/dvb_net.c | 2 +-
drivers/net/appletalk/ipddp.c | 1 -
drivers/net/cris/eth_v10.c | 1 -
drivers/net/ethernet/3com/3c509.c | 1 -
drivers/net/ethernet/3com/3c515.c | 1 -
drivers/net/ethernet/3com/3c574_cs.c | 1 -
drivers/net/ethernet/3com/3c589_cs.c | 1 -
drivers/net/ethernet/3com/3c59x.c | 2 -
drivers/net/ethernet/3com/typhoon.c | 1 -
drivers/net/ethernet/8390/8390.c | 1 -
drivers/net/ethernet/8390/8390p.c | 1 -
drivers/net/ethernet/8390/ax88796.c | 1 -
drivers/net/ethernet/8390/axnet_cs.c | 1 -
drivers/net/ethernet/8390/etherh.c | 1 -
drivers/net/ethernet/8390/hydra.c | 1 -
drivers/net/ethernet/8390/mac8390.c | 1 -
drivers/net/ethernet/8390/mcf8390.c | 1 -
drivers/net/ethernet/8390/ne2k-pci.c | 1 -
drivers/net/ethernet/8390/pcnet_cs.c | 1 -
drivers/net/ethernet/8390/smc-ultra.c | 1 -
drivers/net/ethernet/8390/wd.c | 1 -
drivers/net/ethernet/8390/zorro8390.c | 1 -
drivers/net/ethernet/adaptec/starfire.c | 1 -
drivers/net/ethernet/adi/bfin_mac.c | 1 -
drivers/net/ethernet/allwinner/sun4i-emac.c | 1 -
drivers/net/ethernet/amd/a2065.c | 1 -
drivers/net/ethernet/amd/am79c961a.c | 1 -
drivers/net/ethernet/amd/ariadne.c | 1 -
drivers/net/ethernet/amd/atarilance.c | 1 -
drivers/net/ethernet/amd/au1000_eth.c | 1 -
drivers/net/ethernet/amd/declance.c | 1 -
drivers/net/ethernet/amd/hplance.c | 1 -
drivers/net/ethernet/amd/lance.c | 1 -
drivers/net/ethernet/amd/mvme147.c | 1 -
drivers/net/ethernet/amd/ni65.c | 1 -
drivers/net/ethernet/amd/nmclan_cs.c | 1 -
drivers/net/ethernet/amd/pcnet32.c | 1 -
drivers/net/ethernet/amd/sun3lance.c | 1 -
drivers/net/ethernet/amd/sunlance.c | 1 -
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 7 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 +
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 19 +-
drivers/net/ethernet/apple/bmac.c | 1 -
drivers/net/ethernet/apple/mace.c | 1 -
drivers/net/ethernet/apple/macmace.c | 1 -
drivers/net/ethernet/aurora/nb8800.c | 1 -
drivers/net/ethernet/cadence/macb.c | 1 -
drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 2 +-
drivers/net/ethernet/cirrus/cs89x0.c | 1 -
drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 -
drivers/net/ethernet/cirrus/mac89x0.c | 1 -
drivers/net/ethernet/davicom/dm9000.c | 1 -
drivers/net/ethernet/dec/tulip/de2104x.c | 1 -
drivers/net/ethernet/dec/tulip/de4x5.c | 1 -
drivers/net/ethernet/dec/tulip/dmfe.c | 1 -
drivers/net/ethernet/dec/tulip/tulip_core.c | 1 -
drivers/net/ethernet/dec/tulip/uli526x.c | 1 -
drivers/net/ethernet/dec/tulip/winbond-840.c | 1 -
drivers/net/ethernet/dec/tulip/xircom_cb.c | 1 -
drivers/net/ethernet/dnet.c | 1 -
drivers/net/ethernet/ec_bhf.c | 1 -
drivers/net/ethernet/fealnx.c | 1 -
drivers/net/ethernet/freescale/fec_main.c | 1 -
drivers/net/ethernet/freescale/fec_mpc52xx.c | 1 -
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 -
drivers/net/ethernet/freescale/ucc_geth.c | 1 -
drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 1 -
drivers/net/ethernet/hisilicon/hip04_eth.c | 1 -
drivers/net/ethernet/hisilicon/hisi_femac.c | 1 -
drivers/net/ethernet/hp/hp100.c | 2 -
drivers/net/ethernet/i825xx/82596.c | 1 -
drivers/net/ethernet/i825xx/ether1.c | 1 -
drivers/net/ethernet/i825xx/lib82596.c | 1 -
drivers/net/ethernet/i825xx/sun3_82586.c | 1 -
drivers/net/ethernet/ibm/emac/core.c | 1 -
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +-
drivers/net/ethernet/korina.c | 1 -
drivers/net/ethernet/lantiq_etop.c | 18 +-
drivers/net/ethernet/marvell/mv643xx_eth.c | 164 +++++----
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 1 -
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 +-
drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +-
drivers/net/ethernet/micrel/ks8851.c | 1 -
drivers/net/ethernet/micrel/ks8851_mll.c | 1 -
drivers/net/ethernet/microchip/enc28j60.c | 1 -
drivers/net/ethernet/moxa/moxart_ether.c | 1 -
drivers/net/ethernet/natsemi/jazzsonic.c | 1 -
drivers/net/ethernet/natsemi/macsonic.c | 1 -
drivers/net/ethernet/natsemi/xtsonic.c | 1 -
.../net/ethernet/netronome/nfp/nfp_net_offload.c | 2 +-
drivers/net/ethernet/netx-eth.c | 1 -
drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 -
drivers/net/ethernet/nxp/lpc_eth.c | 1 -
drivers/net/ethernet/packetengines/hamachi.c | 1 -
drivers/net/ethernet/packetengines/yellowfin.c | 1 -
drivers/net/ethernet/qlogic/qed/qed_l2.c | 12 +-
drivers/net/ethernet/qlogic/qed/qed_sp.h | 4 +-
drivers/net/ethernet/qlogic/qed/qed_spq.c | 97 ++++--
drivers/net/ethernet/qlogic/qed/qed_sriov.c | 114 +++++--
drivers/net/ethernet/qlogic/qed/qed_sriov.h | 1 +
drivers/net/ethernet/qlogic/qed/qed_vf.c | 4 +-
drivers/net/ethernet/qlogic/qed/qed_vf.h | 1 +
drivers/net/ethernet/qlogic/qede/qede.h | 1 +
drivers/net/ethernet/qlogic/qede/qede_main.c | 71 +++-
drivers/net/ethernet/qlogic/qla3xxx.c | 1 -
drivers/net/ethernet/rdc/r6040.c | 1 -
drivers/net/ethernet/realtek/atp.c | 1 -
drivers/net/ethernet/renesas/ravb_main.c | 1 -
drivers/net/ethernet/renesas/sh_eth.c | 2 -
drivers/net/ethernet/seeq/ether3.c | 1 -
drivers/net/ethernet/seeq/sgiseeq.c | 1 -
drivers/net/ethernet/sgi/ioc3-eth.c | 1 -
drivers/net/ethernet/sgi/meth.c | 1 -
drivers/net/ethernet/silan/sc92031.c | 1 -
drivers/net/ethernet/sis/sis190.c | 1 -
drivers/net/ethernet/sis/sis900.c | 1 -
drivers/net/ethernet/smsc/epic100.c | 1 -
drivers/net/ethernet/smsc/smc911x.c | 1 -
drivers/net/ethernet/smsc/smc9194.c | 1 -
drivers/net/ethernet/smsc/smc91c92_cs.c | 1 -
drivers/net/ethernet/smsc/smc91x.c | 1 -
drivers/net/ethernet/smsc/smsc911x.c | 1 -
.../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 4 +-
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 1 -
.../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 115 ++++---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 40 ++-
drivers/net/ethernet/sun/sunbmac.c | 1 -
drivers/net/ethernet/sun/sunhme.c | 1 -
drivers/net/ethernet/sun/sunqe.c | 1 -
drivers/net/ethernet/ti/cpmac.c | 1 -
drivers/net/ethernet/ti/cpsw.c | 18 +-
drivers/net/ethernet/ti/netcp_ethss.c | 42 ++-
drivers/net/ethernet/ti/tlan.c | 1 -
drivers/net/ethernet/toshiba/tc35815.c | 1 -
drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
drivers/net/ethernet/via/via-rhine.c | 1 -
drivers/net/ethernet/wiznet/w5100.c | 1 -
drivers/net/ethernet/wiznet/w5300.c | 1 -
drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 -
drivers/net/ethernet/xscale/ixp4xx_eth.c | 1 -
drivers/net/fjes/Makefile | 2 +-
drivers/net/fjes/fjes.h | 16 +
drivers/net/fjes/fjes_debugfs.c | 117 +++++++
drivers/net/fjes/fjes_ethtool.c | 181 +++++++++-
drivers/net/fjes/fjes_hw.c | 171 +++++++++-
drivers/net/fjes/fjes_hw.h | 34 ++
drivers/net/fjes/fjes_main.c | 63 +++-
drivers/net/fjes/fjes_trace.c | 30 ++
drivers/net/fjes/fjes_trace.h | 380 +++++++++++++++++++++
drivers/net/phy/mscc.c | 135 ++++----
drivers/net/plip/plip.c | 1 -
drivers/net/sb1000.c | 1 -
drivers/net/usb/catc.c | 1 -
drivers/net/usb/kaweth.c | 1 -
drivers/net/usb/lan78xx.c | 70 ++--
drivers/net/usb/pegasus.c | 1 -
drivers/net/usb/r8152.c | 3 +-
drivers/net/usb/rtl8150.c | 1 -
drivers/net/wan/sbni.c | 1 -
drivers/net/wireless/intersil/prism54/islpci_dev.c | 1 -
drivers/net/wireless/mac80211_hwsim.c | 1 -
drivers/net/wireless/marvell/libertas/main.c | 1 -
drivers/net/wireless/ray_cs.c | 1 -
drivers/net/wireless/wl3501_cs.c | 1 -
drivers/net/wireless/zydas/zd1201.c | 1 -
drivers/s390/net/lcs.c | 2 +-
drivers/s390/net/netiucv.c | 17 +-
drivers/staging/rtl8188eu/os_dep/mon.c | 1 -
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 -
drivers/staging/rtl8192u/r8192U_core.c | 1 -
drivers/staging/slicoss/slicoss.c | 1 -
include/dt-bindings/net/mscc-phy-vsc8531.h | 21 --
include/linux/netdevice.h | 82 +----
include/linux/qed/qed_eth_if.h | 3 +-
include/net/sctp/structs.h | 3 +-
include/net/tc_act/tc_mirred.h | 6 +-
include/uapi/linux/if_ether.h | 2 +
net/atm/br2684.c | 2 -
net/bluetooth/bnep/netdev.c | 1 -
net/bridge/br_fdb.c | 10 +-
net/core/dev.c | 149 +-------
net/dsa/slave.c | 14 +-
net/ethernet/eth.c | 5 +-
net/irda/irlan/irlan_eth.c | 1 -
net/iucv/af_iucv.c | 34 +-
net/openvswitch/actions.c | 24 +-
net/sched/act_mirred.c | 84 +++--
net/sctp/chunk.c | 32 +-
net/sctp/output.c | 6 +-
net/sctp/outqueue.c | 4 +-
194 files changed, 1777 insertions(+), 863 deletions(-)
create mode 100644 drivers/net/fjes/fjes_debugfs.c
create mode 100644 drivers/net/fjes/fjes_trace.c
create mode 100644 drivers/net/fjes/fjes_trace.h
delete mode 100644 include/dt-bindings/net/mscc-phy-vsc8531.h
Merging ipsec-next/master (2258d927a691 xfrm: remove unused helper)
$ git merge ipsec-next/master
Merge made by the 'recursive' strategy.
net/xfrm/xfrm_state.c | 8 --------
1 file changed, 8 deletions(-)
Merging netfilter-next/master (1b830996c160 Merge branch 's390-net')
$ git merge netfilter-next/master
Already up-to-date.
Merging ipvs-next/master (ae9442f688c3 ipvs: Use IS_ERR_OR_NULL(svc) instead of IS_ERR(svc) || svc == NULL)
$ git merge ipvs-next/master
Merge made by the 'recursive' strategy.
net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging wireless-drivers-next/master (15b95a159502 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git)
$ git merge wireless-drivers-next/master
Already up-to-date.
Merging bluetooth/master (526c86021e51 Bluetooth: hci_bcm: Fix autosuspend PM for Lenovo ThinkPad 8)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
drivers/bluetooth/hci_bcm.c | 8 ++++++++
include/net/bluetooth/bluetooth.h | 25 +++++++++++++------------
2 files changed, 21 insertions(+), 12 deletions(-)
Merging mac80211-next/master (0c317a02ca98 cfg80211: support virtual interfaces with different beacon intervals)
$ git merge mac80211-next/master
Auto-merging net/wireless/util.c
Auto-merging net/mac80211/rx.c
Auto-merging include/net/cfg80211.h
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Merge made by the 'recursive' strategy.
.../broadcom/brcm80211/brcmfmac/cfg80211.c | 22 +++---
drivers/net/wireless/mac80211_hwsim.c | 79 +++++++++++-----------
include/net/cfg80211.h | 61 +++++++++++------
include/uapi/linux/nl80211.h | 8 ++-
net/mac80211/cfg.c | 32 ++-------
net/mac80211/debugfs_netdev.c | 11 +++
net/mac80211/ieee80211_i.h | 18 +++++
net/mac80211/iface.c | 16 +++++
net/mac80211/rx.c | 5 +-
net/mac80211/sta_info.c | 10 +--
net/mac80211/tx.c | 5 +-
net/mac80211/util.c | 44 ++++++------
net/mac80211/wme.c | 23 +++++--
net/wireless/core.h | 2 +-
net/wireless/nl80211.c | 14 +++-
net/wireless/util.c | 71 +++++++++++++------
16 files changed, 253 insertions(+), 168 deletions(-)
Merging rdma/for-next (2937f3757519 staging/lustre: Disable InfiniBand support)
$ git merge rdma/for-next
Already up-to-date.
Merging rdma-leon/rdma-next (c6935931c189 Linux 4.8-rc5)
$ git merge rdma-leon/rdma-next
Already up-to-date.
Merging rdma-leon-test/testing/rdma-next (c6935931c189 Linux 4.8-rc5)
$ git merge rdma-leon-test/testing/rdma-next
Already up-to-date.
Merging mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (69db4aa44fdd Merge tag '4.9/mtd-pairing-scheme' of github.com:linux-nand/linux)
$ git merge l2-mtd/master
Already up-to-date.
Merging nand/nand/next (d44154f969a4 mtd: nand: Provide nand_cleanup() function to free NAND related resources)
$ git merge nand/nand/next
Already up-to-date.
Merging crypto/master (f97581cfa6e7 crypto: caam - treat SGT address pointer as u64)
$ git merge crypto/master
Already up-to-date.
Merging drm/drm-next (69405d3da98b Merge tag 'topic/drm-misc-2016-10-11' of git://anongit.freedesktop.org/drm-intel into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-panel/drm/panel/for-next (c96f566273bf drm/panel: Add JDI LT070ME05000 WUXGA DSI Panel)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (105f1a65b04a drm/i915: Fix conflict resolution from backmerge of v4.8-rc8 to drm-next)
$ git merge drm-intel/for-linux-next
Already up-to-date.
Merging drm-tegra/drm/tegra/for-next (08ee01789eeb drm/tegra: Fix window[0] base address corruption)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/topic/drm-misc (f7741aa75e76 drm/savage: dereferencing an error pointer)
$ git merge drm-misc/topic/drm-misc
Merge made by the 'recursive' strategy.
drivers/dma-buf/reservation.c | 112 +++++++++++++------------------
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c | 24 +++----
drivers/gpu/drm/gma500/framebuffer.c | 3 +-
drivers/gpu/drm/gma500/gtt.c | 2 +
drivers/gpu/drm/nouveau/nouveau_gem.c | 21 +++---
drivers/gpu/drm/savage/savage_state.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +-
include/linux/fence.h | 56 ++++++++++++++--
9 files changed, 124 insertions(+), 107 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (7a3bcc0a8e2a drm/msm: bump kernel api version for explicit fencing)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (523d939ef98f Linux 4.7)
$ git merge hdlcd/for-upstream/hdlcd
Already up-to-date.
Merging mali-dp/for-upstream/mali-dp (59ba2422b430 MAINTAINERS: Add entry for Mali-DP driver)
$ git merge mali-dp/for-upstream/mali-dp
Already up-to-date.
Merging sunxi/sunxi/for-next (d035f1204017 Merge branches 'sunxi/core-for-4.9', 'sunxi/drm-for-4.9', 'sunxi/dt-for-4.9' and 'sunxi/config64-for-4.9', tags 'sunxi-clk-fixes-for-4.8' and 'sunxi-fixes-for-4.8' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging kspp/for-next/kspp (09dd109d8241 latent_entropy: Mark functions with __latent_entropy)
$ git merge kspp/for-next/kspp
Recorded preimage for 'scripts/gcc-plugins/latent_entropy_plugin.c'
Auto-merging scripts/gcc-plugins/latent_entropy_plugin.c
CONFLICT (add/add): Merge conflict in scripts/gcc-plugins/latent_entropy_plugin.c
Auto-merging mm/page_alloc.c
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'scripts/gcc-plugins/latent_entropy_plugin.c'.
[master e58df28cfbf1] Merge remote-tracking branch 'kspp/for-next/kspp'
$ git diff -M --stat --summary HEAD^..
Documentation/kernel-parameters.txt | 5 +++++
mm/page_alloc.c | 21 +++++++++++++++++++++
2 files changed, 26 insertions(+)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (96d87581df93 Merge tag 'regmap-v4.9' into regmap-linus)
$ git merge regmap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging sound/for-next (fdd8218d7d1b ALSA: line6: fix a crash in line6_hwdep_write())
$ git merge sound/for-next
Already up-to-date.
Merging sound-asoc/for-next (681551a3aadf Merge remote-tracking branches 'asoc/fix/cs4270', 'asoc/fix/da7219-pops', 'asoc/fix/tas571x' and 'asoc/fix/topology-abi' into asoc-linus)
$ git merge sound-asoc/for-next
Merge made by the 'recursive' strategy.
include/uapi/sound/asoc.h | 6 --
sound/soc/codecs/cs4270.c | 8 +-
sound/soc/codecs/da7219-aad.c | 18 +++-
sound/soc/codecs/da7219.c | 139 ++++++++++++++++++++++----
sound/soc/codecs/da7219.h | 5 +
sound/soc/codecs/tas571x.c | 37 +++----
sound/soc/intel/Kconfig | 3 +-
sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +-
8 files changed, 159 insertions(+), 61 deletions(-)
Merging modules/modules-next (49aadcf1b6f4 extable.h: add stddef.h so "NULL" definition is not implicit)
$ git merge modules/modules-next
Already up-to-date.
Merging input/next (4a7126a25b4d Merge tag 'v4.8' into next)
$ git merge input/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging block/for-next (25d09398f1c4 Merge branch 'for-4.9/block' into for-next)
$ git merge block/for-next
Merge made by the 'recursive' strategy.
Merging lightnvm/for-next (1a6fe74dfd1b nvme: Pass pointers, not dma addresses, to nvme_get/set_features())
$ git merge lightnvm/for-next
Already up-to-date.
Merging device-mapper/for-next (26e2a95e0d75 dm mirror: use all available legs on multiple failures)
$ git merge device-mapper/for-next
Merge made by the 'recursive' strategy.
drivers/md/dm-raid.c | 3 ++-
drivers/md/dm-raid1.c | 22 +++-------------------
2 files changed, 5 insertions(+), 20 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc-uh/next (77da3da0b22a mmc: sdhci-esdhc-imx: Correct two register accesses)
$ git merge mmc-uh/next
Merge made by the 'recursive' strategy.
drivers/mmc/card/block.c | 3 ++-
drivers/mmc/card/queue.h | 2 +-
drivers/mmc/core/mmc.c | 12 +++++++++
drivers/mmc/host/sdhci-esdhc-imx.c | 23 +++++++++++++++-
drivers/mmc/host/sdhci-of-arasan.c | 26 +++++++++++++++++-
drivers/mmc/host/sdhci-pci-core.c | 54 +++++++++++++++++++++++++++++++++++++-
drivers/mmc/host/sdhci-pci.h | 2 ++
drivers/mmc/host/sdhci-pxav3.c | 2 +-
drivers/mmc/host/sdhci.c | 40 ++++++++++++++--------------
drivers/mmc/host/sdhci.h | 2 ++
10 files changed, 139 insertions(+), 27 deletions(-)
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
kernel/debug/kdb/kdb_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (5a5a36351abe lib/raid6: Add AVX2 optimized xor_syndrome functions)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
lib/raid6/avx2.c | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 229 insertions(+), 3 deletions(-)
Merging mfd/for-mfd-next (b8d336ed90f5 mfd: arizona: Handle probe deferral for reset GPIO)
$ git merge mfd/for-mfd-next
Already up-to-date.
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/for-next (1d72706f0485 power: supply: bq27xxx_battery: allow kernel poll_interval parameter runtime update)
$ git merge battery/for-next
Already up-to-date.
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (80f473833aba Merge tag 'regulator-v4.9' into regulator-linus)
$ git merge regulator/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging security/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
$ git merge security/next
Already up-to-date.
Merging integrity/next (56078b570983 module: Fully remove the kernel_module_from_file hook)
$ git merge integrity/next
Merge made by the 'recursive' strategy.
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
$ git merge keys/keys-next
Merge made by the 'recursive' strategy.
Documentation/crypto/asymmetric-keys.txt | 26 ++-
Documentation/security/keys.txt | 217 ++++++++++++++++++++
certs/Kconfig | 18 ++
certs/Makefile | 6 +
certs/blacklist.c | 174 ++++++++++++++++
certs/blacklist.h | 3 +
certs/blacklist_hashes.c | 6 +
certs/blacklist_nohashes.c | 5 +
crypto/asymmetric_keys/Kconfig | 10 +
crypto/asymmetric_keys/Makefile | 13 ++
crypto/asymmetric_keys/asymmetric_keys.h | 3 +
crypto/asymmetric_keys/asymmetric_type.c | 59 +++++-
crypto/asymmetric_keys/pkcs7_parser.c | 1 +
crypto/asymmetric_keys/pkcs7_parser.h | 1 +
crypto/asymmetric_keys/pkcs7_verify.c | 32 ++-
crypto/asymmetric_keys/pkcs8.asn1 | 24 +++
crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++
crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++--
crypto/asymmetric_keys/signature.c | 95 +++++++++
crypto/asymmetric_keys/x509_cert_parser.c | 21 +-
crypto/asymmetric_keys/x509_parser.h | 1 +
crypto/asymmetric_keys/x509_public_key.c | 15 ++
include/crypto/public_key.h | 14 +-
include/keys/asymmetric-subtype.h | 9 +
include/keys/system_keyring.h | 12 ++
include/linux/key-type.h | 11 +
include/linux/keyctl.h | 46 +++++
include/uapi/linux/keyctl.h | 30 +++
security/keys/Makefile | 1 +
security/keys/compat.c | 18 ++
security/keys/internal.h | 39 ++++
security/keys/keyctl.c | 24 +++
security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++
33 files changed, 1584 insertions(+), 52 deletions(-)
create mode 100644 certs/blacklist.c
create mode 100644 certs/blacklist.h
create mode 100644 certs/blacklist_hashes.c
create mode 100644 certs/blacklist_nohashes.c
create mode 100644 crypto/asymmetric_keys/pkcs8.asn1
create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c
create mode 100644 include/linux/keyctl.h
create mode 100644 security/keys/keyctl_pkey.c
Merging selinux/next (1306d8e1c09f Merge tag 'tpmdd-next-20160927' of git://git.infradead.org/users/jjs/linux-tpmdd into ra-next)
$ git merge selinux/next
Already up-to-date.
Merging tpmdd/next (213ebc81ac3f tmp/tpm_crb: implement runtime pm for tpm_crb)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
drivers/char/tpm/tpm-interface.c | 8 +-
drivers/char/tpm/tpm_crb.c | 176 +++++++++++++++++++++++++++++++++------
2 files changed, 157 insertions(+), 27 deletions(-)
Merging watchdog/master (39487f6688a5 watchdog: imx2_wdt: add pretimeout function support)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (13a08259187c Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/renesas' and 'arm/smmu' into next)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (2566278551d3 Merge git://git.infradead.org/intel-iommu)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (61771468e0a5 vfio_pci: use pci_alloc_irq_vectors)
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (380cc42d5a6c nvme: add missing \n to end of dev_warn message)
$ git merge trivial/for-next
Auto-merging net/netfilter/core.c
Auto-merging drivers/nvme/host/pci.c
Auto-merging drivers/nvme/host/lightnvm.c
Merge made by the 'recursive' strategy.
drivers/char/agp/intel-agp.c | 2 +-
drivers/nvme/host/lightnvm.c | 2 +-
drivers/nvme/host/pci.c | 2 +-
net/netfilter/core.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
Merging audit/next (7ff89ac608d9 audit: add exclude filter extension to feature bitmap)
$ git merge audit/next
Already up-to-date.
Merging devicetree/for-next (87e5fc99b028 DT: irqchip: renesas-irqc: document R8A7743/5 support)
$ git merge devicetree/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (a649244de727 dt-bindings: mailbox: Add Amlogic Meson MHU Bindings)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (ed34b9560902 Merge tag 'spi-v4.9' into spi-linus)
$ git merge spi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tip/auto-latest (1e1a4b0f5412 Merge branch 'perf/urgent')
$ git merge tip/auto-latest
Auto-merging lib/Kconfig.debug
Auto-merging kernel/trace/Kconfig
Auto-merging kernel/Makefile
Auto-merging include/linux/ftrace.h
Merge made by the 'recursive' strategy.
include/linux/ftrace.h | 2 ++
kernel/Makefile | 7 +++++++
kernel/trace/Kconfig | 1 +
lib/Kconfig.debug | 10 ++++++++++
4 files changed, 20 insertions(+)
Merging clockevents/clockevents/next (1d661bf5327a clocksource/drivers/time-armada-370-xp: Fix return value check)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (a29d64a45eed EDAC, altera: Add IRQ Flags to disable IRQ while handling)
$ git merge edac-amd/for-next
Already up-to-date.
Merging irqchip/irqchip/for-next (0ccb54a7dba0 Merge branch 'irqchip/core' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Merge made by the 'recursive' strategy.
arch/sh/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging ftrace/for-next (f971cc9aabc2 tracing: Have max_latency be defined for HWLAT_TRACER as well)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (e53e0b3e7b3c rcu: Make expedited grace periods recheck dyntick idle state)
$ git merge rcu/rcu/next
Auto-merging lib/Kconfig.debug
Auto-merging kernel/rcu/tree.c
Auto-merging include/linux/bug.h
Merge made by the 'recursive' strategy.
.../Design/Expedited-Grace-Periods/ExpRCUFlow.svg | 830 +++++++++++++++++++++
.../Expedited-Grace-Periods/ExpSchedFlow.svg | 826 ++++++++++++++++++++
.../Expedited-Grace-Periods.html | 476 ++++++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++
.../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++
.../RCU/Design/Requirements/Requirements.html | 25 +-
drivers/misc/lkdtm.h | 2 +
drivers/misc/lkdtm_bugs.c | 68 ++
drivers/misc/lkdtm_core.c | 2 +
include/linux/bug.h | 17 +
include/linux/list.h | 37 +-
include/linux/rculist.h | 8 +-
include/trace/events/rcu.h | 5 +-
kernel/rcu/Makefile | 3 +-
kernel/rcu/rcutorture.c | 11 +-
kernel/rcu/tree.c | 17 +-
kernel/rcu/tree.h | 1 +
kernel/rcu/tree_exp.h | 12 +-
kernel/rcu/waketorture.c | 537 +++++++++++++
lib/Kconfig.debug | 35 +-
lib/list_debug.c | 99 +--
tools/testing/selftests/rcutorture/.gitignore | 2 -
.../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 +
.../selftests/rcutorture/bin/kvm-recheck.sh | 2 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 7 +-
.../selftests/rcutorture/configs/wake/CFLIST | 1 +
.../selftests/rcutorture/configs/wake/CFcommon | 2 +
tools/testing/selftests/rcutorture/configs/wake/SH | 19 +
.../selftests/rcutorture/configs/wake/SH.boot | 1 +
.../testing/selftests/rcutorture/configs/wake/STI | 19 +
.../selftests/rcutorture/configs/wake/STI.boot | 1 +
.../rcutorture/configs/wake/ver_functions.sh | 43 ++
39 files changed, 5849 insertions(+), 109 deletions(-)
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg
create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg
create mode 100644 kernel/rcu/waketorture.c
create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh
Merging kvm/linux-next (6218590bcb45 Merge tag 'kvm-4.9-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/next (0099b7701f52 KVM: arm/arm64: vgic: Don't flush/sync without a working vgic)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-mips/next (bf18db4e7bd9 KVM: MIPS: Drop dubious EntryHi optimisation)
$ git merge kvm-mips/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvm-ppc-paulus/kvm-ppc-next (fa73c3b25bd8 KVM: PPC: Book3s PR: Allow access to unprivileged MMCR2 register)
$ git merge kvm-ppc-paulus/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (b0eb91ae630a Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (a6a198bc60e6 xen/x86: Update topology map for PV VCPUs)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (9b7396624a7b mm/percpu.c: fix potential memory leakage for pcpu_embed_first_chunk())
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (863b710b664b workqueue: remove keventd_up())
$ git merge workqueues/for-next
Auto-merging mm/slab.c
Auto-merging kernel/workqueue.c
Auto-merging init/main.c
Auto-merging include/linux/workqueue.h
Auto-merging drivers/tty/vt/vt.c
Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
Merge made by the 'recursive' strategy.
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
drivers/tty/vt/vt.c | 4 ---
include/linux/workqueue.h | 11 ++----
init/main.c | 10 ++++++
kernel/power/qos.c | 11 +-----
kernel/workqueue.c | 78 +++++++++++++++++++++++++++++++---------
lib/debugobjects.c | 2 +-
mm/slab.c | 7 +---
8 files changed, 79 insertions(+), 46 deletions(-)
Merging drivers-x86/for-next (127595ed21c1 platform/x86: intel_pmc_core: avoid boot time warning for !CONFIG_DEBUGFS_FS)
$ git merge drivers-x86/for-next
Already up-to-date.
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (6f3bad967072 leds: triggers: Check return value of kobject_uevent_env())
$ git merge leds/for-next
Already up-to-date.
Merging ipmi/for-next (bd85f4b37ddf ipmi: fix crash on reading version from proc after unregisted bmc)
$ git merge ipmi/for-next
Auto-merging include/uapi/linux/Kbuild
Auto-merging drivers/Makefile
Merge made by the 'recursive' strategy.
.../bindings/ipmi/aspeed,ast2400-bt-bmc.txt | 23 +
.../bindings/{ipmi.txt => ipmi/ipmi-smic.txt} | 0
drivers/Makefile | 2 +-
drivers/char/ipmi/Kconfig | 8 +
drivers/char/ipmi/Makefile | 1 +
drivers/char/ipmi/bt-bmc.c | 505 +++++++++++++++++++++
drivers/char/ipmi/ipmi_msghandler.c | 7 +-
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/bt-bmc.h | 18 +
9 files changed, 560 insertions(+), 5 deletions(-)
create mode 100644 Documentation/devicetree/bindings/ipmi/aspeed,ast2400-bt-bmc.txt
rename Documentation/devicetree/bindings/{ipmi.txt => ipmi/ipmi-smic.txt} (100%)
create mode 100644 drivers/char/ipmi/bt-bmc.c
create mode 100644 include/uapi/linux/bt-bmc.h
Merging driver-core/driver-core-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge usb/usb-next
Already up-to-date.
Merging usb-gadget/next (e6be244a8321 usb: gadget: uvc: add V4L2 dependency)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (61fc51366b39 USB: serial: ti_usb_3410_5052: remove unused variables)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (c6900310b6cc usb: chipidea: imx: Disable internal 60Mhz clock with ULPI PHY)
$ git merge usb-chipidea-next/ci-for-usb-next
Merge made by the 'recursive' strategy.
drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++
drivers/usb/chipidea/ci_hdrc_imx.h | 1 +
drivers/usb/chipidea/udc.c | 6 +--
drivers/usb/chipidea/udc.h | 12 +++---
drivers/usb/chipidea/usbmisc_imx.c | 86 +++++++++++++++++++++++++++++++-------
5 files changed, 86 insertions(+), 23 deletions(-)
Merging staging/staging-next (29fbff8698fc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge staging/staging-next
Already up-to-date.
Merging char-misc/char-misc-next (b66484cd7470 Merge branch 'akpm' (patches from Andrew))
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging extcon/extcon-next (38085c987f52 extcon: Add support for qcom SPMI PMIC USB id detection hardware)
$ git merge extcon/extcon-next
Already up-to-date.
Merging slave-dma/next (8df33b00f57d Merge branch 'for-linus' into next)
$ git merge slave-dma/next
Merge made by the 'recursive' strategy.
Merging cgroup/for-next (4221d2ce6e57 Merge branch 'for-4.9' into for-next)
$ git merge cgroup/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging scsi/for-next (51ff5072f431 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging libata/for-next (df073d9e6a7d Merge branch 'for-4.9' into for-next)
$ git merge libata/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (789ffaecf80b virtio_pci: Limit DMA mask to 44 bits for legacy virtio devices)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
drivers/virtio/virtio_pci_legacy.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
$ git merge remoteproc/for-next
Resolved 'drivers/remoteproc/remoteproc_core.c' using previous resolution.
Auto-merging drivers/remoteproc/remoteproc_core.c
CONFLICT (content): Merge conflict in drivers/remoteproc/remoteproc_core.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4c012712f889] Merge remote-tracking branch 'remoteproc/for-next'
$ git diff -M --stat --summary HEAD^..
Merging rpmsg/for-next (2fdd6c32d6a5 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging gpio/for-next (a5ea9f982d2b gpio: mxs: Unmap region obtained by of_iomap)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
Documentation/gpio/board.txt | 11 +++++++----
drivers/gpio/gpio-mxs.c | 8 ++++++--
2 files changed, 13 insertions(+), 6 deletions(-)
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (dc8e6e1e8f2d Merge branch 'for-4.9/drivers' into for-next)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8ad06f84a237] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
Merging userns/for-next (069d5ac9ae0d autofs: Fix automounts by using current_real_cred()->uid)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (b4626a7f4892 CLK: Add Loongson1C clock support)
$ git merge clk/clk-next
Already up-to-date.
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
$ git merge random/dev
Already up-to-date.
Merging aio/master (b562e44f507e Linux 4.5)
$ git merge aio/master
Already up-to-date.
Merging kselftest/next (fecf861e765b selftests/futex: Check ANSI terminal color support)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (549eb7b22e24 AFS: Correctly use 64-bit time for UUID)
$ git merge y2038/y2038
Resolved 'fs/afs/main.c' using previous resolution.
Auto-merging fs/afs/main.c
CONFLICT (content): Merge conflict in fs/afs/main.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f53e77f22322] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
fs/afs/main.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (b562e44f507e Linux 4.5)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (2992ef29ae01 livepatch/module: make TAINT_LIVEPATCH module-specific)
$ git merge livepatching/for-next
Already up-to-date.
Merging coresight/next (27dbe886867a coresight: etm3x: Adding missing features of Coresight PTM components)
$ git merge coresight/next
Auto-merging drivers/hwtracing/coresight/coresight-stm.c
Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c
Auto-merging drivers/hwtracing/coresight/coresight-etm.h
Merge made by the 'recursive' strategy.
drivers/hwtracing/coresight/coresight-etm.h | 5 +++++
drivers/hwtracing/coresight/coresight-etm3x-sysfs.c | 12 +++++++++++-
drivers/hwtracing/coresight/coresight-stm.c | 4 ++--
3 files changed, 18 insertions(+), 3 deletions(-)
Merging rtc/rtc-next (1cd713762e4c rtc: rv8803: set VDETOFF and SWOFF via device tree)
$ git merge rtc/rtc-next
Already up-to-date.
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (e476f94482fc Merge branch 'for-4.9/dax' into libnvdimm-for-next)
$ git merge nvdimm/libnvdimm-for-next
Already up-to-date.
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging akpm-current/current (000cf9328226 kdump, vmcoreinfo: report actual value of phys_base)
$ git merge --no-ff akpm-current/current
Auto-merging mm/slab.c
Auto-merging arch/powerpc/platforms/85xx/corenet_generic.c
Auto-merging arch/powerpc/kernel/traps.c
Auto-merging arch/powerpc/kernel/misc_64.S
Auto-merging arch/powerpc/kernel/misc_32.S
Auto-merging arch/powerpc/kernel/head_64.S
Auto-merging arch/powerpc/kernel/Makefile
Auto-merging arch/powerpc/Makefile
Auto-merging arch/Kconfig
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/kernel-parameters.txt | 4 +
Kbuild | 12 +-
arch/Kconfig | 3 +
arch/arm/include/asm/page.h | 2 +
arch/ia64/kernel/Makefile | 8 +-
arch/powerpc/Kconfig | 16 +-
arch/powerpc/Makefile | 1 +
arch/powerpc/boot/string.S | 67 ++--
arch/powerpc/configs/powernv_defconfig | 2 +
arch/powerpc/configs/ppc64_defconfig | 2 +
arch/powerpc/configs/pseries_defconfig | 2 +
arch/powerpc/include/asm/debug.h | 2 +-
arch/powerpc/include/asm/elf_util.h | 92 +++++
arch/powerpc/include/asm/ima.h | 29 ++
arch/powerpc/include/asm/kexec.h | 28 +-
arch/powerpc/include/asm/kexec_elf_64.h | 10 +
arch/powerpc/include/asm/machdep.h | 4 +-
arch/powerpc/include/asm/module.h | 14 +-
arch/powerpc/include/asm/smp.h | 2 +-
arch/powerpc/include/asm/systbl.h | 1 +
arch/powerpc/include/asm/unistd.h | 2 +-
arch/powerpc/include/uapi/asm/unistd.h | 1 +
arch/powerpc/kernel/Makefile | 8 +-
arch/powerpc/kernel/elf_util.c | 476 ++++++++++++++++++++++++++
arch/powerpc/kernel/elf_util_64.c | 376 ++++++++++++++++++++
arch/powerpc/kernel/head_64.S | 2 +-
arch/powerpc/kernel/ima_kexec.c | 223 ++++++++++++
arch/powerpc/kernel/kexec_elf_64.c | 282 +++++++++++++++
arch/powerpc/kernel/machine_kexec_64.c | 474 +++++++++++++++++++++++++
arch/powerpc/kernel/misc_32.S | 2 +-
arch/powerpc/kernel/misc_64.S | 6 +-
arch/powerpc/kernel/module_64.c | 329 +++---------------
arch/powerpc/kernel/prom.c | 2 +-
arch/powerpc/kernel/setup_64.c | 4 +-
arch/powerpc/kernel/smp.c | 6 +-
arch/powerpc/kernel/traps.c | 2 +-
arch/powerpc/platforms/85xx/corenet_generic.c | 2 +-
arch/powerpc/platforms/85xx/smp.c | 8 +-
arch/powerpc/platforms/cell/spu_base.c | 2 +-
arch/powerpc/platforms/powernv/setup.c | 6 +-
arch/powerpc/platforms/ps3/setup.c | 4 +-
arch/powerpc/platforms/pseries/Makefile | 2 +-
arch/powerpc/platforms/pseries/setup.c | 4 +-
arch/powerpc/purgatory/.gitignore | 2 +
arch/powerpc/purgatory/Makefile | 48 +++
arch/powerpc/purgatory/console-ppc64.c | 38 ++
arch/powerpc/purgatory/crashdump-ppc64.h | 42 +++
arch/powerpc/purgatory/crashdump_backup.c | 36 ++
arch/powerpc/purgatory/crtsavres.S | 5 +
arch/powerpc/purgatory/hvCall.S | 27 ++
arch/powerpc/purgatory/hvCall.h | 8 +
arch/powerpc/purgatory/kexec-sha256.h | 11 +
arch/powerpc/purgatory/ppc64_asm.h | 20 ++
arch/powerpc/purgatory/printf.c | 164 +++++++++
arch/powerpc/purgatory/purgatory-ppc64.c | 41 +++
arch/powerpc/purgatory/purgatory-ppc64.h | 6 +
arch/powerpc/purgatory/purgatory.c | 62 ++++
arch/powerpc/purgatory/purgatory.h | 11 +
arch/powerpc/purgatory/sha256.c | 6 +
arch/powerpc/purgatory/sha256.h | 1 +
arch/powerpc/purgatory/string.S | 2 +
arch/powerpc/purgatory/v2wrap.S | 134 ++++++++
arch/um/Makefile | 2 +-
arch/x86/kernel/crash.c | 37 +-
arch/x86/kernel/kexec-bzimage64.c | 48 +--
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/um/shared/sysdep/kernel-offsets.h | 2 +-
arch/x86/um/user-offsets.c | 4 +-
block/genhd.c | 2 +-
include/linux/crc64_ecma.h | 56 +++
include/linux/ima.h | 12 +
include/linux/kbuild.h | 2 +-
include/linux/kernel.h | 15 +
include/linux/kexec.h | 38 +-
include/linux/llist.h | 26 +-
include/trace/events/zsmalloc.h | 76 ++++
kernel/kcov.c | 9 +-
kernel/kexec_file.c | 145 ++++----
kernel/kexec_internal.h | 16 -
kernel/watchdog.c | 1 -
lib/Kconfig | 7 +
lib/Makefile | 1 +
lib/crc64_ecma.c | 341 ++++++++++++++++++
mm/page_owner.c | 4 +-
mm/slab.c | 2 +-
mm/zsmalloc.c | 27 +-
scripts/mod/Makefile | 11 +-
security/integrity/ima/Kconfig | 12 +
security/integrity/ima/Makefile | 1 +
security/integrity/ima/ima.h | 31 ++
security/integrity/ima/ima_crypto.c | 6 +-
security/integrity/ima/ima_fs.c | 30 +-
security/integrity/ima/ima_init.c | 2 +
security/integrity/ima/ima_kexec.c | 168 +++++++++
security/integrity/ima/ima_main.c | 1 +
security/integrity/ima/ima_queue.c | 76 +++-
security/integrity/ima/ima_template.c | 293 +++++++++++++++-
security/integrity/ima/ima_template_lib.c | 7 +-
98 files changed, 4147 insertions(+), 553 deletions(-)
create mode 100644 arch/powerpc/include/asm/elf_util.h
create mode 100644 arch/powerpc/include/asm/ima.h
create mode 100644 arch/powerpc/include/asm/kexec_elf_64.h
create mode 100644 arch/powerpc/kernel/elf_util.c
create mode 100644 arch/powerpc/kernel/elf_util_64.c
create mode 100644 arch/powerpc/kernel/ima_kexec.c
create mode 100644 arch/powerpc/kernel/kexec_elf_64.c
create mode 100644 arch/powerpc/purgatory/.gitignore
create mode 100644 arch/powerpc/purgatory/Makefile
create mode 100644 arch/powerpc/purgatory/console-ppc64.c
create mode 100644 arch/powerpc/purgatory/crashdump-ppc64.h
create mode 100644 arch/powerpc/purgatory/crashdump_backup.c
create mode 100644 arch/powerpc/purgatory/crtsavres.S
create mode 100644 arch/powerpc/purgatory/hvCall.S
create mode 100644 arch/powerpc/purgatory/hvCall.h
create mode 100644 arch/powerpc/purgatory/kexec-sha256.h
create mode 100644 arch/powerpc/purgatory/ppc64_asm.h
create mode 100644 arch/powerpc/purgatory/printf.c
create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.c
create mode 100644 arch/powerpc/purgatory/purgatory-ppc64.h
create mode 100644 arch/powerpc/purgatory/purgatory.c
create mode 100644 arch/powerpc/purgatory/purgatory.h
create mode 100644 arch/powerpc/purgatory/sha256.c
create mode 100644 arch/powerpc/purgatory/sha256.h
create mode 100644 arch/powerpc/purgatory/string.S
create mode 100644 arch/powerpc/purgatory/v2wrap.S
create mode 100644 include/linux/crc64_ecma.h
create mode 100644 include/trace/events/zsmalloc.h
create mode 100644 lib/crc64_ecma.c
create mode 100644 security/integrity/ima/ima_kexec.c
$ git am -3 ../patches/0001-powerpc-merge-fix-for-CONFIG_WORD_SIZE-BITS-rename.patch
Applying: powerpc: merge fix for CONFIG_WORD_SIZE -> BITS rename
$ git reset HEAD^
Unstaged changes after reset:
M arch/powerpc/kernel/Makefile
M arch/powerpc/purgatory/Makefile
$ git add -A .
$ git commit -v -a --amend
[master f11c53ece63c] Merge branch 'akpm-current/current'
Date: Sun Oct 16 10:37:55 2016 +1100
$ git am -3 ../patches/0001-powerpc-include-asm-ima.h-for-setup_ima_buffer.patch
Applying: powerpc: include asm/ima.h for setup_ima_buffer
$ git reset HEAD^
Unstaged changes after reset:
M arch/powerpc/kernel/machine_kexec_64.c
$ git add -A .
$ git commit -v -a --amend
[master c2f1c9d6049e] Merge branch 'akpm-current/current'
Date: Sun Oct 16 10:37:55 2016 +1100
$ git am -3 ../patches/0001-powerpc-disable-KEXEC_FILE-for-now.patch
Applying: powerpc: disable KEXEC_FILE for now
$ git reset HEAD^
Unstaged changes after reset:
M arch/powerpc/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master 2ef44eb59856] Merge branch 'akpm-current/current'
Date: Sun Oct 16 10:37:55 2016 +1100
$ 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: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ a6d96fe76e61...1128a3af41c9 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (1128a3af41c9 drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
|
