1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
|
$ date
Friday 1 March 11:03:02 EST 2013
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 309667e Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Merging origin/master (de1a226 Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux)
$ git merge origin/master
Updating 309667e..de1a226
Fast-forward
Documentation/DMA-API-HOWTO.txt | 9 +-
Documentation/IPMI.txt | 18 +-
Documentation/block/cfq-iosched.txt | 58 +
Documentation/blockdev/nbd.txt | 38 +-
Documentation/cgroups/blkio-controller.txt | 37 +-
Documentation/kernel-parameters.txt | 5 +
MAINTAINERS | 28 +-
arch/Kconfig | 7 +
arch/alpha/Kconfig | 1 +
arch/arm/Kconfig | 1 +
arch/arm/kernel/kprobes.c | 6 +-
arch/avr32/Kconfig | 1 +
arch/blackfin/Kconfig | 1 +
arch/cris/Kconfig | 1 +
arch/frv/Kconfig | 1 +
arch/frv/mm/elf-fdpic.c | 49 +-
arch/h8300/Kconfig | 1 +
arch/ia64/Kconfig | 1 +
arch/ia64/kernel/kprobes.c | 8 +-
arch/m32r/Kconfig | 1 +
arch/m68k/Kconfig | 1 +
arch/microblaze/Kconfig | 1 +
arch/mips/Kconfig | 1 +
arch/mips/kernel/kprobes.c | 6 +-
arch/mn10300/Kconfig | 1 +
arch/openrisc/Kconfig | 1 +
arch/parisc/Kconfig | 1 +
arch/parisc/kernel/sys_parisc.c | 48 +-
arch/powerpc/Kconfig | 4 +-
arch/powerpc/kernel/kprobes.c | 6 +-
arch/powerpc/kvm/book3s_mmu_hpte.c | 18 +-
arch/s390/Kconfig | 1 +
arch/s390/kernel/kprobes.c | 8 +-
arch/s390/pci/pci_msi.c | 3 +-
arch/score/Kconfig | 1 +
arch/sh/Kconfig | 3 -
arch/sh/kernel/kprobes.c | 6 +-
arch/sparc/Kconfig | 3 -
arch/sparc/kernel/kprobes.c | 6 +-
arch/sparc/kernel/ldc.c | 3 +-
arch/tile/Kconfig | 1 +
arch/unicore32/Kconfig | 1 +
arch/x86/Kconfig | 1 +
arch/x86/boot/compressed/eboot.c | 26 +-
arch/x86/include/asm/efi.h | 9 +-
arch/x86/kernel/head.c | 53 +-
arch/x86/kernel/head_64.S | 4 +-
arch/x86/kernel/kprobes/core.c | 8 +-
arch/x86/kernel/setup.c | 3 +-
arch/x86/kvm/mmu.c | 26 +-
arch/x86/platform/efi/efi.c | 7 +-
arch/xtensa/Kconfig | 1 +
block/Kconfig | 1 -
block/blk-cgroup.c | 281 ++++-
block/blk-cgroup.h | 68 +-
block/blk-core.c | 18 +-
block/blk-exec.c | 4 +-
block/blk-flush.c | 2 +-
block/blk-ioc.c | 3 +-
block/blk-lib.c | 6 +-
block/blk-sysfs.c | 9 +-
block/blk.h | 2 +-
block/bsg.c | 29 +-
block/cfq-iosched.c | 632 ++++++++--
block/elevator.c | 25 +-
block/genhd.c | 24 +-
block/partition-generic.c | 6 +-
block/partitions/check.c | 37 +-
block/partitions/check.h | 4 +-
block/partitions/efi.c | 12 +-
block/partitions/mac.c | 4 +
block/partitions/msdos.c | 11 +-
crypto/algapi.c | 6 +-
drivers/acpi/Kconfig | 3 +-
drivers/atm/atmtcp.c | 6 +-
drivers/atm/eni.c | 3 +-
drivers/atm/he.c | 3 +-
drivers/atm/nicstar.c | 25 +-
drivers/atm/solos-pci.c | 3 +-
drivers/block/DAC960.c | 1 +
drivers/block/Kconfig | 23 +-
drivers/block/Makefile | 3 +-
drivers/block/drbd/drbd_main.c | 29 +-
drivers/block/loop.c | 85 +-
drivers/block/mtip32xx/Kconfig | 2 +-
drivers/block/mtip32xx/mtip32xx.c | 431 +++++--
drivers/block/mtip32xx/mtip32xx.h | 48 +-
drivers/block/nbd.c | 36 +-
drivers/block/rsxx/Makefile | 2 +
drivers/block/rsxx/config.c | 213 ++++
drivers/block/rsxx/core.c | 649 ++++++++++
drivers/block/rsxx/cregs.c | 758 ++++++++++++
drivers/block/rsxx/dev.c | 367 ++++++
drivers/block/rsxx/dma.c | 998 +++++++++++++++
drivers/block/rsxx/rsxx.h | 45 +
drivers/block/rsxx/rsxx_cfg.h | 72 ++
drivers/block/rsxx/rsxx_priv.h | 399 ++++++
drivers/block/swim3.c | 5 +-
drivers/block/xd.c | 1123 -----------------
drivers/block/xd.h | 134 --
drivers/block/xen-blkback/blkback.c | 7 +-
drivers/block/xen-blkback/xenbus.c | 49 +-
drivers/block/xen-blkfront.c | 13 +-
drivers/char/ipmi/ipmi_si_intf.c | 66 +-
drivers/char/misc.c | 16 +-
drivers/clk/clk.c | 59 +-
drivers/dca/dca-sysfs.c | 23 +-
drivers/dma/dmaengine.c | 16 +-
drivers/firewire/core-cdev.c | 20 +-
drivers/firewire/core-device.c | 7 +-
drivers/firmware/efivars.c | 146 ++-
drivers/gpio/gpiolib.c | 11 +-
drivers/gpu/drm/drm_context.c | 19 +-
drivers/gpu/drm/drm_crtc.c | 20 +-
drivers/gpu/drm/drm_drv.c | 1 -
drivers/gpu/drm/drm_gem.c | 40 +-
drivers/gpu/drm/drm_hashtab.c | 19 +-
drivers/gpu/drm/drm_stub.c | 19 +-
drivers/gpu/drm/exynos/exynos_drm_ipp.c | 20 +-
drivers/gpu/drm/i915/i915_gem_context.c | 21 +-
drivers/gpu/drm/sis/sis_drv.c | 1 -
drivers/gpu/drm/sis/sis_mm.c | 13 +-
drivers/gpu/drm/via/via_map.c | 1 -
drivers/gpu/drm/via/via_mm.c | 13 +-
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 17 +-
drivers/i2c/i2c-core.c | 46 +-
drivers/infiniband/core/cm.c | 22 +-
drivers/infiniband/core/cma.c | 27 +-
drivers/infiniband/core/fmr_pool.c | 3 +-
drivers/infiniband/core/sa_query.c | 18 +-
drivers/infiniband/core/ucm.c | 16 +-
drivers/infiniband/core/ucma.c | 32 +-
drivers/infiniband/core/uverbs_cmd.c | 17 +-
drivers/infiniband/hw/amso1100/c2_qp.c | 19 +-
drivers/infiniband/hw/cxgb3/iwch.h | 24 +-
drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 27 +-
drivers/infiniband/hw/ehca/ehca_cq.c | 27 +-
drivers/infiniband/hw/ehca/ehca_qp.c | 34 +-
drivers/infiniband/hw/ipath/ipath_driver.c | 16 +-
drivers/infiniband/hw/mlx4/cm.c | 32 +-
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 14 +-
drivers/infiniband/hw/qib/qib_init.c | 21 +-
drivers/isdn/mISDN/socket.c | 3 +-
drivers/isdn/mISDN/stack.c | 3 +-
drivers/md/dm-bio-prison.c | 3 +-
drivers/md/dm-bufio.c | 3 +-
drivers/md/dm-snap.c | 3 +-
drivers/md/dm.c | 56 +-
.../md/persistent-data/dm-transaction-manager.c | 7 +-
drivers/md/raid5.c | 14 +-
drivers/memstick/core/memstick.c | 21 +-
drivers/memstick/core/mspro_block.c | 17 +-
drivers/memstick/host/r592.c | 3 +-
drivers/mfd/rtsx_pcr.c | 13 +-
drivers/misc/c2port/core.c | 22 +-
drivers/misc/sgi-gru/grutlbpurge.c | 3 +-
drivers/misc/tifm_core.c | 11 +-
drivers/misc/vmw_vmci/vmci_doorbell.c | 7 +-
drivers/misc/vmw_vmci/vmci_resource.c | 6 +-
drivers/mmc/core/host.c | 11 +-
drivers/mmc/host/dw_mmc.c | 4 +-
drivers/mtd/mtdcore.c | 9 +-
drivers/mtd/tests/mtd_nandecctest.c | 2 +-
drivers/mtd/tests/mtd_oobtest.c | 49 +-
drivers/mtd/tests/mtd_pagetest.c | 43 +-
drivers/mtd/tests/mtd_speedtest.c | 9 +-
drivers/mtd/tests/mtd_stresstest.c | 3 +-
drivers/mtd/tests/mtd_subpagetest.c | 42 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 18 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 10 +-
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 10 +-
drivers/net/ethernet/sun/sunvnet.c | 3 +-
drivers/net/macvlan.c | 6 +-
drivers/net/macvtap.c | 21 +-
drivers/net/ppp/ppp_generic.c | 33 +-
drivers/net/tun.c | 15 +-
drivers/net/vxlan.c | 12 +-
drivers/net/wireless/zd1201.c | 7 +-
drivers/pci/pci.c | 12 +-
drivers/power/bq2415x_charger.c | 11 +-
drivers/power/bq27x00_battery.c | 9 +-
drivers/power/ds2782_battery.c | 9 +-
drivers/pps/clients/pps-gpio.c | 6 +-
drivers/pps/kapi.c | 2 +-
drivers/pps/pps.c | 36 +-
drivers/remoteproc/remoteproc_core.c | 11 +-
drivers/rpmsg/virtio_rpmsg_bus.c | 31 +-
drivers/scsi/aacraid/aacraid.h | 8 +-
drivers/scsi/aacraid/comminit.c | 11 +-
drivers/scsi/bfa/bfad.c | 2 +-
drivers/scsi/bfa/bfad_im.c | 15 +-
drivers/scsi/bnx2fc/bnx2fc.h | 27 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 21 +-
drivers/scsi/bnx2fc/bnx2fc_hwi.c | 29 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 8 +-
drivers/scsi/bnx2fc/bnx2fc_tgt.c | 95 +-
drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
drivers/scsi/ch.c | 21 +-
drivers/scsi/csiostor/csio_hw.c | 15 +-
drivers/scsi/csiostor/csio_init.c | 9 +-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
drivers/scsi/fnic/fnic_fcs.c | 6 +-
drivers/scsi/gdth.c | 10 +-
drivers/scsi/ipr.c | 1296 +++++++++++++++-----
drivers/scsi/ipr.h | 101 +-
drivers/scsi/lpfc/lpfc.h | 17 +-
drivers/scsi/lpfc/lpfc_bsg.c | 51 +-
drivers/scsi/lpfc/lpfc_crtn.h | 4 +-
drivers/scsi/lpfc/lpfc_ct.c | 37 +-
drivers/scsi/lpfc/lpfc_els.c | 25 +-
drivers/scsi/lpfc/lpfc_hw.h | 2 +
drivers/scsi/lpfc/lpfc_hw4.h | 176 +--
drivers/scsi/lpfc/lpfc_init.c | 261 ++--
drivers/scsi/lpfc/lpfc_nportdisc.c | 10 +
drivers/scsi/lpfc/lpfc_scsi.c | 24 +-
drivers/scsi/lpfc/lpfc_sli.c | 378 +++++-
drivers/scsi/lpfc/lpfc_sli4.h | 8 +
drivers/scsi/lpfc/lpfc_version.h | 2 +-
drivers/scsi/mpt2sas/mpt2sas_base.c | 19 +-
drivers/scsi/mpt2sas/mpt2sas_base.h | 1 +
drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +-
drivers/scsi/mpt3sas/mpt3sas_config.c | 1 -
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 -
drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 1 -
drivers/scsi/qla4xxx/ql4_83xx.c | 55 +-
drivers/scsi/qla4xxx/ql4_attr.c | 16 +-
drivers/scsi/qla4xxx/ql4_def.h | 10 +-
drivers/scsi/qla4xxx/ql4_fw.h | 6 +-
drivers/scsi/qla4xxx/ql4_glbl.h | 6 +-
drivers/scsi/qla4xxx/ql4_init.c | 17 +-
drivers/scsi/qla4xxx/ql4_iocb.c | 2 +-
drivers/scsi/qla4xxx/ql4_isr.c | 68 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 61 +-
drivers/scsi/qla4xxx/ql4_nx.c | 14 +-
drivers/scsi/qla4xxx/ql4_os.c | 160 ++-
drivers/scsi/qla4xxx/ql4_version.h | 2 +-
drivers/scsi/scsi_transport_iscsi.c | 12 +
drivers/scsi/sg.c | 43 +-
drivers/scsi/st.c | 27 +-
drivers/staging/android/binder.c | 19 +-
drivers/target/iscsi/iscsi_target.c | 15 +-
drivers/target/iscsi/iscsi_target_login.c | 15 +-
drivers/target/tcm_fc/tfc_sess.c | 12 +-
drivers/thermal/cpu_cooling.c | 17 +-
drivers/thermal/thermal_sys.c | 17 +-
drivers/uio/uio.c | 19 +-
drivers/vfio/vfio.c | 17 +-
drivers/video/backlight/Kconfig | 6 +
drivers/video/backlight/Makefile | 1 +
drivers/video/backlight/ams369fg06.c | 8 +-
drivers/video/backlight/lp8788_bl.c | 333 +++++
drivers/w1/slaves/Kconfig | 13 +-
drivers/w1/slaves/Makefile | 3 +-
drivers/w1/slaves/w1_ds2413.c | 177 +++
drivers/w1/w1_family.h | 1 +
fs/affs/amigaffs.c | 3 +-
fs/aio.c | 3 +-
fs/bio.c | 2 +
fs/block_dev.c | 6 +-
fs/btrfs/extent-tree.c | 20 +-
fs/buffer.c | 10 +
fs/cifs/inode.c | 3 +-
fs/coredump.c | 2 +-
fs/dcache.c | 9 +-
fs/dlm/lock.c | 18 +-
fs/dlm/lockspace.c | 1 -
fs/dlm/lowcomms.c | 11 +-
fs/dlm/recover.c | 52 +-
fs/ecryptfs/messaging.c | 6 +-
fs/exec.c | 10 +-
fs/exportfs/expfs.c | 3 +-
fs/ext4/inode.c | 8 +-
fs/fat/fat.h | 2 +
fs/fat/inode.c | 77 +-
fs/fat/nfs.c | 3 +-
fs/fs-writeback.c | 60 +-
fs/fscache/cookie.c | 11 +-
fs/hfsplus/Makefile | 4 +-
fs/hfsplus/attributes.c | 399 ++++++
fs/hfsplus/bfind.c | 93 +-
fs/hfsplus/bnode.c | 8 +-
fs/hfsplus/brec.c | 23 +-
fs/hfsplus/btree.c | 8 +
fs/hfsplus/catalog.c | 36 +-
fs/hfsplus/dir.c | 55 +-
fs/hfsplus/extents.c | 4 +-
fs/hfsplus/hfsplus_fs.h | 52 +-
fs/hfsplus/hfsplus_raw.h | 68 +-
fs/hfsplus/inode.c | 18 +-
fs/hfsplus/ioctl.c | 108 --
fs/hfsplus/super.c | 56 +-
fs/hfsplus/unicode.c | 7 +-
fs/hfsplus/xattr.c | 709 +++++++++++
fs/hfsplus/xattr.h | 60 +
fs/hfsplus/xattr_security.c | 104 ++
fs/hfsplus/xattr_trusted.c | 63 +
fs/hfsplus/xattr_user.c | 63 +
fs/inode.c | 19 +-
fs/lockd/host.c | 29 +-
fs/lockd/svcsubs.c | 7 +-
fs/nfs/client.c | 1 -
fs/nfs/nfs4client.c | 13 +-
fs/nfs/pnfs_dev.c | 9 +-
fs/nfsd/nfscache.c | 3 +-
fs/notify/fsnotify.c | 3 +-
fs/notify/inode_mark.c | 19 +-
fs/notify/inotify/inotify_fsnotify.c | 1 -
fs/notify/inotify/inotify_user.c | 24 +-
fs/notify/vfsmount_mark.c | 19 +-
fs/ocfs2/cluster/tcp.c | 32 +-
fs/ocfs2/dcache.c | 3 +-
fs/ocfs2/dlm/dlmrecovery.c | 6 +-
fs/ocfs2/suballoc.c | 7 +-
fs/ocfs2/suballoc.h | 2 +-
fs/ocfs2/xattr.c | 2 +-
fs/proc/base.c | 3 +-
fs/proc/generic.c | 27 +-
fs/proc/inode.c | 5 +-
fs/proc/internal.h | 3 +-
fs/proc/kcore.c | 3 +-
fs/proc/proc_devtree.c | 13 +-
fs/proc/proc_sysctl.c | 19 +-
fs/proc/vmcore.c | 35 +-
fs/seq_file.c | 40 +-
fs/super.c | 8 +-
fs/sysfs/bin.c | 3 +-
fs/xfs/xfs_log_recover.c | 3 +-
include/linux/blkdev.h | 3 +-
include/linux/blktrace_api.h | 1 +
include/linux/buffer_head.h | 2 +-
include/linux/completion.h | 3 +
include/linux/debug_locks.h | 4 +-
include/linux/elevator.h | 5 +-
include/linux/eventfd.h | 2 +-
include/linux/freezer.h | 3 +
include/linux/hashtable.h | 40 +-
include/linux/idr.h | 170 ++-
include/linux/if_team.h | 6 +-
include/linux/ipmi.h | 4 -
include/linux/list.h | 49 +-
include/linux/llist.h | 25 -
include/linux/mfd/lp8788.h | 24 +-
include/linux/pid.h | 3 +-
include/linux/rculist.h | 56 +-
include/linux/scatterlist.h | 41 +-
include/linux/sched.h | 5 -
include/linux/writeback.h | 6 +-
include/net/ax25.h | 8 +-
include/net/inet_hashtables.h | 4 +-
include/net/inet_timewait_sock.h | 8 +-
include/net/netrom.h | 16 +-
include/net/sch_generic.h | 3 +-
include/net/sctp/sctp.h | 4 +-
include/net/sock.h | 21 +-
include/trace/events/block.h | 104 +-
include/trace/events/writeback.h | 116 ++
include/uapi/linux/ipmi.h | 10 +-
include/uapi/linux/msdos_fs.h | 38 +-
include/uapi/linux/nbd.h | 3 +-
include/uapi/linux/xattr.h | 13 +-
ipc/util.c | 30 +-
kernel/Makefile | 6 +-
kernel/cgroup.c | 43 +-
kernel/events/core.c | 16 +-
kernel/exit.c | 6 +-
kernel/fork.c | 7 +-
kernel/kexec.c | 44 +-
kernel/kprobes.c | 35 +-
kernel/lockdep.c | 17 +-
kernel/pid.c | 3 +-
kernel/posix-timers.c | 18 +-
kernel/sched/core.c | 63 +-
kernel/signal.c | 14 +-
kernel/smpboot.c | 2 +-
kernel/sys.c | 10 +-
kernel/sysctl.c | 2 +-
kernel/sysctl_binary.c | 3 +-
kernel/trace/blktrace.c | 28 +-
kernel/trace/ftrace.c | 24 +-
kernel/trace/trace_output.c | 3 +-
kernel/tracepoint.c | 6 +-
kernel/user-return-notifier.c | 4 +-
kernel/user.c | 3 +-
kernel/utsname.c | 2 +-
kernel/utsname_sysctl.c | 3 +-
kernel/workqueue.c | 13 +-
lib/Makefile | 2 +-
lib/debugobjects.c | 21 +-
lib/devres.c | 2 +-
lib/idr.c | 446 ++++---
{kernel => lib}/kfifo.c | 6 +-
lib/lru_cache.c | 3 +-
lib/scatterlist.c | 86 +-
mm/Kconfig | 2 +-
mm/huge_memory.c | 3 +-
mm/internal.h | 2 +-
mm/kmemleak.c | 9 +-
mm/ksm.c | 15 +-
mm/mlock.c | 34 +-
mm/mmu_notifier.c | 18 +-
mm/page-writeback.c | 4 +-
net/9p/error.c | 4 +-
net/9p/trans_virtio.c | 2 +-
net/9p/util.c | 17 +-
net/appletalk/ddp.c | 9 +-
net/atm/common.c | 7 +-
net/atm/lec.c | 66 +-
net/atm/signaling.c | 3 +-
net/ax25/af_ax25.c | 15 +-
net/ax25/ax25_ds_subr.c | 6 +-
net/ax25/ax25_ds_timer.c | 3 +-
net/ax25/ax25_iface.c | 3 +-
net/ax25/ax25_uid.c | 11 +-
net/batman-adv/bat_iv_ogm.c | 12 +-
net/batman-adv/bridge_loop_avoidance.c | 39 +-
net/batman-adv/distributed-arp-table.c | 15 +-
net/batman-adv/gateway_client.c | 13 +-
net/batman-adv/main.c | 6 +-
net/batman-adv/originator.c | 31 +-
net/batman-adv/originator.h | 3 +-
net/batman-adv/routing.c | 6 +-
net/batman-adv/send.c | 6 +-
net/batman-adv/translation-table.c | 82 +-
net/batman-adv/vis.c | 38 +-
net/bluetooth/hci_sock.c | 15 +-
net/bluetooth/rfcomm/sock.c | 13 +-
net/bluetooth/sco.c | 14 +-
net/bridge/br_fdb.c | 23 +-
net/bridge/br_mdb.c | 6 +-
net/bridge/br_multicast.c | 25 +-
net/can/af_can.c | 18 +-
net/can/gw.c | 15 +-
net/can/proc.c | 3 +-
net/core/dev.c | 12 +-
net/core/flow.c | 11 +-
net/core/net-procfs.c | 3 +-
net/core/rtnetlink.c | 3 +-
net/decnet/af_decnet.c | 9 +-
net/decnet/dn_table.c | 13 +-
net/ieee802154/dgram.c | 3 +-
net/ieee802154/raw.c | 3 +-
net/ipv4/devinet.c | 10 +-
net/ipv4/fib_frontend.c | 15 +-
net/ipv4/fib_semantics.c | 23 +-
net/ipv4/fib_trie.c | 33 +-
net/ipv4/inet_connection_sock.c | 10 +-
net/ipv4/inet_fragment.c | 10 +-
net/ipv4/inet_hashtables.c | 8 +-
net/ipv4/inet_timewait_sock.c | 7 +-
net/ipv4/raw.c | 8 +-
net/ipv4/tcp_ipv4.c | 7 +-
net/ipv6/addrconf.c | 32 +-
net/ipv6/addrlabel.c | 18 +-
net/ipv6/inet6_connection_sock.c | 5 +-
net/ipv6/ip6_fib.c | 12 +-
net/ipv6/raw.c | 3 +-
net/ipv6/xfrm6_tunnel.c | 10 +-
net/ipx/af_ipx.c | 16 +-
net/ipx/ipx_proc.c | 5 +-
net/iucv/af_iucv.c | 21 +-
net/key/af_key.c | 3 +-
net/l2tp/l2tp_core.c | 12 +-
net/l2tp/l2tp_ip.c | 3 +-
net/l2tp/l2tp_ip6.c | 3 +-
net/llc/llc_sap.c | 3 +-
net/mac80211/main.c | 2 -
net/mac80211/mesh_pathtbl.c | 45 +-
net/mac80211/tx.c | 18 +-
net/netfilter/ipvs/ip_vs_conn.c | 26 +-
net/netfilter/nf_conntrack_expect.c | 17 +-
net/netfilter/nf_conntrack_helper.c | 13 +-
net/netfilter/nf_conntrack_netlink.c | 9 +-
net/netfilter/nf_conntrack_sip.c | 8 +-
net/netfilter/nf_nat_core.c | 3 +-
net/netfilter/nfnetlink_cthelper.c | 17 +-
net/netfilter/nfnetlink_log.c | 7 +-
net/netfilter/nfnetlink_queue_core.c | 10 +-
net/netfilter/xt_RATEEST.c | 3 +-
net/netfilter/xt_connlimit.c | 8 +-
net/netfilter/xt_hashlimit.c | 16 +-
net/netlink/af_netlink.c | 30 +-
net/netrom/af_netrom.c | 12 +-
net/netrom/nr_route.c | 30 +-
net/nfc/llcp/llcp.c | 16 +-
net/openvswitch/datapath.c | 10 +-
net/openvswitch/flow.c | 13 +-
net/openvswitch/vport.c | 3 +-
net/packet/af_packet.c | 3 +-
net/packet/diag.c | 3 +-
net/phonet/pep.c | 3 +-
net/phonet/socket.c | 9 +-
net/rds/bind.c | 3 +-
net/rds/connection.c | 9 +-
net/rose/af_rose.c | 14 +-
net/sched/sch_api.c | 4 +-
net/sched/sch_cbq.c | 18 +-
net/sched/sch_drr.c | 10 +-
net/sched/sch_hfsc.c | 15 +-
net/sched/sch_htb.c | 12 +-
net/sched/sch_qfq.c | 16 +-
net/sctp/associola.c | 31 +-
net/sctp/endpointola.c | 3 +-
net/sctp/input.c | 6 +-
net/sctp/proc.c | 9 +-
net/sctp/socket.c | 9 +-
net/sunrpc/auth.c | 5 +-
net/sunrpc/cache.c | 4 +-
net/sunrpc/svcauth.c | 3 +-
net/tipc/name_table.c | 8 +-
net/tipc/node.c | 3 +-
net/unix/af_unix.c | 6 +-
net/unix/diag.c | 7 +-
net/x25/af_x25.c | 12 +-
net/xfrm/xfrm_policy.c | 47 +-
net/xfrm/xfrm_state.c | 42 +-
scripts/checkpatch.pl | 2 +-
scripts/get_maintainer.pl | 4 +
scripts/kernel-doc | 2 +-
security/integrity/ima/ima_queue.c | 3 +-
security/selinux/avc.c | 19 +-
tools/perf/util/evlist.c | 3 +-
tools/testing/selftests/Makefile | 8 +-
tools/testing/selftests/README.txt | 42 +
tools/testing/selftests/efivarfs/Makefile | 12 +
tools/testing/selftests/efivarfs/create-read.c | 38 +
tools/testing/selftests/efivarfs/efivarfs.sh | 139 +++
tools/testing/selftests/efivarfs/open-unlink.c | 63 +
virt/kvm/eventfd.c | 3 +-
virt/kvm/irq_comm.c | 18 +-
533 files changed, 12863 insertions(+), 6214 deletions(-)
create mode 100644 drivers/block/rsxx/Makefile
create mode 100644 drivers/block/rsxx/config.c
create mode 100644 drivers/block/rsxx/core.c
create mode 100644 drivers/block/rsxx/cregs.c
create mode 100644 drivers/block/rsxx/dev.c
create mode 100644 drivers/block/rsxx/dma.c
create mode 100644 drivers/block/rsxx/rsxx.h
create mode 100644 drivers/block/rsxx/rsxx_cfg.h
create mode 100644 drivers/block/rsxx/rsxx_priv.h
delete mode 100644 drivers/block/xd.c
delete mode 100644 drivers/block/xd.h
create mode 100644 drivers/video/backlight/lp8788_bl.c
create mode 100644 drivers/w1/slaves/w1_ds2413.c
create mode 100644 fs/hfsplus/attributes.c
create mode 100644 fs/hfsplus/xattr.c
create mode 100644 fs/hfsplus/xattr.h
create mode 100644 fs/hfsplus/xattr_security.c
create mode 100644 fs/hfsplus/xattr_trusted.c
create mode 100644 fs/hfsplus/xattr_user.c
rename {kernel => lib}/kfifo.c (99%)
create mode 100644 tools/testing/selftests/README.txt
create mode 100644 tools/testing/selftests/efivarfs/Makefile
create mode 100644 tools/testing/selftests/efivarfs/create-read.c
create mode 100644 tools/testing/selftests/efivarfs/efivarfs.sh
create mode 100644 tools/testing/selftests/efivarfs/open-unlink.c
Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arm-current/fixes (e36815e ARM: Fix broken commit 0cc41e4a21d43 corrupting kernel messages)
$ git merge arm-current/fixes
Auto-merging drivers/amba/tegra-ahb.c
Auto-merging arch/arm/kernel/smp.c
Auto-merging arch/arm/include/asm/pgtable.h
Merge made by the 'recursive' strategy.
arch/arm/boot/Makefile | 4 ++--
arch/arm/include/asm/delay.h | 1 +
arch/arm/include/asm/pgtable.h | 3 ++-
arch/arm/kernel/smp.c | 3 +++
arch/arm/lib/delay.c | 1 +
arch/arm/mm/alignment.c | 11 ++++-------
arch/arm/vfp/vfphw.S | 37 ++++++++++++++++++++++---------------
arch/arm/vfp/vfpmodule.c | 2 +-
drivers/amba/tegra-ahb.c | 2 +-
9 files changed, 37 insertions(+), 27 deletions(-)
Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging powerpc-merge/merge (eda8eeb powerpc/mm: Fix hash computation function)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging sparc/master (f9fd348 sparc32: refactor smp boot)
$ git merge sparc/master
Already up-to-date.
Merging net/master (32fcafb net/phy: micrel: Disable asymmetric pause for KSZ9021)
$ git merge net/master
Auto-merging net/sctp/socket.c
Merge made by the 'recursive' strategy.
drivers/connector/cn_proc.c | 8 ++
drivers/isdn/hisax/st5481_usb.c | 12 ++-
drivers/net/bonding/bond_main.c | 2 +-
drivers/net/ethernet/broadcom/bgmac.c | 4 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
.../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 ++
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 64 +++++++++++++++-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 3 +-
drivers/net/ethernet/realtek/r8169.c | 27 ++++---
drivers/net/ethernet/sfc/efx.c | 16 +++-
drivers/net/ethernet/sfc/net_driver.h | 4 +-
drivers/net/ethernet/sfc/rx.c | 25 ++++---
drivers/net/ethernet/ti/cpsw.c | 2 +-
drivers/net/phy/micrel.c | 3 +-
drivers/net/phy/phy_device.c | 10 ++-
drivers/net/usb/asix_devices.c | 31 ++++++++
drivers/net/usb/cdc_ncm.c | 8 ++
include/linux/netfilter/ipset/ip_set_ahash.h | 4 +-
include/net/tcp.h | 4 +
net/irda/iriap.c | 7 +-
net/netfilter/ipset/ip_set_core.c | 3 +-
net/sctp/socket.c | 6 +-
net/sctp/tsnmap.c | 13 ++--
net/sctp/ulpqueue.c | 87 ++++++++++++++++++----
24 files changed, 285 insertions(+), 66 deletions(-)
Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush())
$ git merge ipsec/master
Auto-merging net/key/af_key.c
Merge made by the 'recursive' strategy.
net/key/af_key.c | 1 +
1 file changed, 1 insertion(+)
Merging sound-current/for-linus (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (4660269 libertas: fix crash for SD8688)
$ git merge wireless/master
Auto-merging net/mac80211/tx.c
Auto-merging drivers/net/wireless/ath/ath9k/hw.c
Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
Auto-merging drivers/bcma/driver_pci_host.c
Merge made by the 'recursive' strategy.
drivers/bcma/driver_pci_host.c | 2 +
drivers/net/wireless/ath/ath9k/common.h | 2 +-
drivers/net/wireless/ath/ath9k/htc.h | 1 +
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 18 +++--
drivers/net/wireless/ath/ath9k/hw.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-devtrace.h | 10 +--
drivers/net/wireless/iwlwifi/iwl-phy-db.c | 16 ----
drivers/net/wireless/iwlwifi/mvm/d3.c | 104 +++++++++++++++++++-------
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 19 +++--
drivers/net/wireless/iwlwifi/mvm/mvm.h | 4 +
drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +++
drivers/net/wireless/iwlwifi/pcie/tx.c | 75 ++++++++++++++-----
drivers/net/wireless/libertas/if_sdio.c | 6 +-
drivers/net/wireless/mwifiex/pcie.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +-
net/mac80211/cfg.c | 12 ++-
net/mac80211/iface.c | 2 +-
net/mac80211/tx.c | 77 ++++++++++++-------
net/wireless/nl80211.c | 61 +--------------
19 files changed, 258 insertions(+), 174 deletions(-)
Merging driver-core.current/driver-core-linus (949db15 Linux 3.8-rc5)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (221f8df USB: EHCI: revert "remove ASS/PSS polling timeout")
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
drivers/usb/host/ehci-timer.c | 29 ++++++++++++++---------------
1 file changed, 14 insertions(+), 15 deletions(-)
Merging staging.current/staging-linus (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (302a3c0 Drivers: hv: vmbus: Use the new infrastructure for delivering VMBUS interrupts)
$ git merge char-misc.current/char-misc-linus
Merge made by the 'recursive' strategy.
drivers/hv/channel_mgmt.c | 2 +-
drivers/hv/hv.c | 5 ++---
drivers/hv/vmbus_drv.c | 11 +++++++----
3 files changed, 10 insertions(+), 8 deletions(-)
Merging input-current/for-linus (171fb58 Input: ALPS - update documentation for recent touchpad driver mods)
$ git merge input-current/for-linus
Auto-merging Documentation/input/alps.txt
Merge made by the 'recursive' strategy.
Documentation/input/alps.txt | 67 ++++++++++++++++++++++++++----
drivers/input/mouse/alps.c | 85 +++++++++++++++++++++++++++++++++------
drivers/input/mouse/alps.h | 1 +
drivers/input/mouse/cypress_ps2.c | 19 ++++++---
4 files changed, 146 insertions(+), 26 deletions(-)
Merging md-current/for-linus (f3378b4 md: expedite metadata update when switching read-auto -> active)
$ git merge md-current/for-linus
Auto-merging drivers/md/raid5.c
Merge made by the 'recursive' strategy.
Documentation/device-mapper/dm-raid.txt | 44 ++++++++++--
drivers/md/Kconfig | 11 ---
drivers/md/dm-raid.c | 123 ++++++++++++++++++++++++++------
drivers/md/md.c | 19 ++++-
drivers/md/raid0.c | 13 +++-
drivers/md/raid1.c | 8 ++-
drivers/md/raid10.c | 97 +++++++++++++++++++------
drivers/md/raid10.h | 5 ++
drivers/md/raid5.c | 38 +---------
9 files changed, 256 insertions(+), 102 deletions(-)
Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
$ git merge audit-current/for-linus
Already up-to-date.
Merging crypto-current/master (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
$ git merge ide/master
Already up-to-date.
Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option)
$ git merge dwmw2/master
Resolved 'arch/powerpc/Kconfig' using previous resolution.
Resolved 'arch/x86/Kconfig' using previous resolution.
Auto-merging arch/x86/Makefile
Auto-merging arch/x86/Kconfig
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Auto-merging arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master bb48acd] Merge remote-tracking branch 'dwmw2/master'
$ git diff -M --stat --summary HEAD^..
arch/x86/Kconfig.cpu | 4 ++++
arch/x86/Makefile | 1 +
2 files changed, 5 insertions(+)
Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
$ git merge sh-current/sh-fixes-for-linus
Already up-to-date.
Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6)
$ git merge irqdomain-current/irqdomain/merge
Already up-to-date.
Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().)
$ git merge spi-current/spi/merge
Already up-to-date.
Merging gpio-current/gpio/merge (bc1008c gpio/mvebu-gpio: Make mvebu-gpio depend on OF_CONFIG)
$ git merge gpio-current/gpio/merge
Already up-to-date.
Merging rr-fixes/fixes (6515925 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (8ccfe66 ARC: split elf.h into uapi and export it for userspace)
$ git merge arc/for-next
Resolved 'init/Kconfig' using previous resolution.
Auto-merging tools/perf/perf.h
Auto-merging kernel/sysctl.c
Auto-merging init/Kconfig
CONFLICT (content): Merge conflict in init/Kconfig
Auto-merging arch/parisc/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4c3e4f3] Merge remote-tracking branch 'arc/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/arc/interrupts.txt | 24 +
MAINTAINERS | 6 +
arch/arc/Kbuild | 2 +
arch/arc/Kconfig | 453 +++++++
arch/arc/Kconfig.debug | 34 +
arch/arc/Makefile | 126 ++
arch/arc/boot/Makefile | 26 +
arch/arc/boot/dts/Makefile | 13 +
arch/arc/boot/dts/angel4.dts | 55 +
arch/arc/boot/dts/skeleton.dts | 10 +
arch/arc/boot/dts/skeleton.dtsi | 37 +
arch/arc/configs/fpga_defconfig | 61 +
arch/arc/include/asm/Kbuild | 49 +
arch/arc/include/asm/arcregs.h | 433 +++++++
arch/arc/include/asm/asm-offsets.h | 9 +
arch/arc/include/asm/atomic.h | 232 ++++
arch/arc/include/asm/barrier.h | 42 +
arch/arc/include/asm/bitops.h | 516 ++++++++
arch/arc/include/asm/bug.h | 37 +
arch/arc/include/asm/cache.h | 75 ++
arch/arc/include/asm/cacheflush.h | 67 +
arch/arc/include/asm/checksum.h | 101 ++
arch/arc/include/asm/clk.h | 22 +
arch/arc/include/asm/cmpxchg.h | 143 +++
arch/arc/include/asm/current.h | 32 +
arch/arc/include/asm/defines.h | 56 +
arch/arc/include/asm/delay.h | 68 +
arch/arc/include/asm/disasm.h | 116 ++
arch/arc/include/asm/dma-mapping.h | 221 ++++
arch/arc/include/asm/dma.h | 14 +
arch/arc/include/asm/elf.h | 78 ++
arch/arc/include/asm/entry.h | 724 +++++++++++
arch/arc/include/asm/exec.h | 15 +
arch/arc/include/asm/futex.h | 151 +++
arch/arc/include/asm/io.h | 105 ++
arch/arc/include/asm/irq.h | 25 +
arch/arc/include/asm/irqflags.h | 153 +++
arch/arc/include/asm/kdebug.h | 19 +
arch/arc/include/asm/kgdb.h | 61 +
arch/arc/include/asm/kprobes.h | 62 +
arch/arc/include/asm/linkage.h | 63 +
arch/arc/include/asm/mach_desc.h | 87 ++
arch/arc/include/asm/mmu.h | 23 +
arch/arc/include/asm/mmu_context.h | 213 ++++
arch/arc/include/asm/module.h | 28 +
arch/arc/include/asm/mutex.h | 18 +
arch/arc/include/asm/page.h | 109 ++
arch/arc/include/asm/perf_event.h | 13 +
arch/arc/include/asm/pgalloc.h | 134 ++
arch/arc/include/asm/pgtable.h | 405 ++++++
arch/arc/include/asm/processor.h | 151 +++
arch/arc/include/asm/prom.h | 14 +
arch/arc/include/asm/ptrace.h | 130 ++
arch/arc/include/asm/sections.h | 18 +
arch/arc/include/asm/segment.h | 24 +
arch/arc/include/asm/serial.h | 25 +
arch/arc/include/asm/setup.h | 37 +
arch/arc/include/asm/smp.h | 130 ++
arch/arc/include/asm/spinlock.h | 144 +++
arch/arc/include/asm/spinlock_types.h | 35 +
arch/arc/include/asm/string.h | 40 +
arch/arc/include/asm/switch_to.h | 41 +
arch/arc/include/asm/syscall.h | 72 ++
arch/arc/include/asm/syscalls.h | 29 +
arch/arc/include/asm/thread_info.h | 121 ++
arch/arc/include/asm/timex.h | 18 +
arch/arc/include/asm/tlb-mmu1.h | 104 ++
arch/arc/include/asm/tlb.h | 58 +
arch/arc/include/asm/tlbflush.h | 28 +
arch/arc/include/asm/uaccess.h | 751 +++++++++++
arch/arc/include/asm/unaligned.h | 29 +
arch/arc/include/asm/unwind.h | 163 +++
arch/arc/include/uapi/asm/Kbuild | 12 +
arch/arc/include/uapi/asm/byteorder.h | 18 +
arch/arc/include/uapi/asm/cachectl.h | 28 +
arch/arc/include/uapi/asm/elf.h | 26 +
arch/arc/include/uapi/asm/page.h | 39 +
arch/arc/include/uapi/asm/ptrace.h | 48 +
arch/arc/include/uapi/asm/setup.h | 6 +
arch/arc/include/uapi/asm/sigcontext.h | 22 +
arch/arc/include/uapi/asm/signal.h | 27 +
arch/arc/include/uapi/asm/swab.h | 98 ++
arch/arc/include/uapi/asm/unistd.h | 34 +
arch/arc/kernel/Makefile | 33 +
arch/arc/kernel/arc_hostlink.c | 58 +
arch/arc/kernel/arcksyms.c | 56 +
arch/arc/kernel/asm-offsets.c | 64 +
arch/arc/kernel/clk.c | 21 +
arch/arc/kernel/ctx_sw.c | 109 ++
arch/arc/kernel/ctx_sw_asm.S | 58 +
arch/arc/kernel/devtree.c | 123 ++
arch/arc/kernel/disasm.c | 538 ++++++++
arch/arc/kernel/entry.S | 839 ++++++++++++
arch/arc/kernel/fpu.c | 55 +
arch/arc/kernel/head.S | 111 ++
arch/arc/kernel/irq.c | 273 ++++
arch/arc/kernel/kgdb.c | 205 +++
arch/arc/kernel/kprobes.c | 525 ++++++++
arch/arc/kernel/module.c | 145 +++
arch/arc/kernel/process.c | 235 ++++
arch/arc/kernel/ptrace.c | 158 +++
arch/arc/kernel/reset.c | 33 +
arch/arc/kernel/setup.c | 473 +++++++
arch/arc/kernel/signal.c | 360 ++++++
arch/arc/kernel/smp.c | 332 +++++
arch/arc/kernel/stacktrace.c | 254 ++++
arch/arc/kernel/sys.c | 18 +
arch/arc/kernel/time.c | 265 ++++
arch/arc/kernel/traps.c | 170 +++
arch/arc/kernel/troubleshoot.c | 322 +++++
arch/arc/kernel/unaligned.c | 245 ++++
arch/arc/kernel/unwind.c | 1329 ++++++++++++++++++++
arch/arc/kernel/vmlinux.lds.S | 163 +++
arch/arc/lib/Makefile | 9 +
arch/arc/lib/memcmp.S | 124 ++
arch/arc/lib/memcpy-700.S | 66 +
arch/arc/lib/memset.S | 59 +
arch/arc/lib/strchr-700.S | 123 ++
arch/arc/lib/strcmp.S | 96 ++
arch/arc/lib/strcpy-700.S | 70 ++
arch/arc/lib/strlen.S | 83 ++
arch/arc/mm/Makefile | 10 +
arch/arc/mm/cache_arc700.c | 768 +++++++++++
arch/arc/mm/dma.c | 94 ++
arch/arc/mm/extable.c | 63 +
arch/arc/mm/fault.c | 228 ++++
arch/arc/mm/init.c | 187 +++
arch/arc/mm/ioremap.c | 91 ++
arch/arc/mm/tlb.c | 645 ++++++++++
arch/arc/mm/tlbex.S | 408 ++++++
arch/arc/oprofile/Makefile | 9 +
arch/arc/oprofile/common.c | 26 +
arch/arc/plat-arcfpga/Kconfig | 84 ++
arch/arc/plat-arcfpga/Makefile | 12 +
arch/arc/plat-arcfpga/include/plat/irq.h | 31 +
arch/arc/plat-arcfpga/include/plat/memmap.h | 31 +
arch/arc/plat-arcfpga/include/plat/smp.h | 118 ++
arch/arc/plat-arcfpga/irq.c | 25 +
arch/arc/plat-arcfpga/platform.c | 226 ++++
arch/arc/plat-arcfpga/smp.c | 171 +++
arch/parisc/Kconfig | 1 +
include/asm-generic/checksum.h | 4 +
include/asm-generic/uaccess.h | 14 +-
init/Kconfig | 8 +
kernel/sysctl.c | 5 +
lib/checksum.c | 2 +
tools/perf/perf.h | 6 +
147 files changed, 19552 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/arc/interrupts.txt
create mode 100644 arch/arc/Kbuild
create mode 100644 arch/arc/Kconfig
create mode 100644 arch/arc/Kconfig.debug
create mode 100644 arch/arc/Makefile
create mode 100644 arch/arc/boot/Makefile
create mode 100644 arch/arc/boot/dts/Makefile
create mode 100644 arch/arc/boot/dts/angel4.dts
create mode 100644 arch/arc/boot/dts/skeleton.dts
create mode 100644 arch/arc/boot/dts/skeleton.dtsi
create mode 100644 arch/arc/configs/fpga_defconfig
create mode 100644 arch/arc/include/asm/Kbuild
create mode 100644 arch/arc/include/asm/arcregs.h
create mode 100644 arch/arc/include/asm/asm-offsets.h
create mode 100644 arch/arc/include/asm/atomic.h
create mode 100644 arch/arc/include/asm/barrier.h
create mode 100644 arch/arc/include/asm/bitops.h
create mode 100644 arch/arc/include/asm/bug.h
create mode 100644 arch/arc/include/asm/cache.h
create mode 100644 arch/arc/include/asm/cacheflush.h
create mode 100644 arch/arc/include/asm/checksum.h
create mode 100644 arch/arc/include/asm/clk.h
create mode 100644 arch/arc/include/asm/cmpxchg.h
create mode 100644 arch/arc/include/asm/current.h
create mode 100644 arch/arc/include/asm/defines.h
create mode 100644 arch/arc/include/asm/delay.h
create mode 100644 arch/arc/include/asm/disasm.h
create mode 100644 arch/arc/include/asm/dma-mapping.h
create mode 100644 arch/arc/include/asm/dma.h
create mode 100644 arch/arc/include/asm/elf.h
create mode 100644 arch/arc/include/asm/entry.h
create mode 100644 arch/arc/include/asm/exec.h
create mode 100644 arch/arc/include/asm/futex.h
create mode 100644 arch/arc/include/asm/io.h
create mode 100644 arch/arc/include/asm/irq.h
create mode 100644 arch/arc/include/asm/irqflags.h
create mode 100644 arch/arc/include/asm/kdebug.h
create mode 100644 arch/arc/include/asm/kgdb.h
create mode 100644 arch/arc/include/asm/kprobes.h
create mode 100644 arch/arc/include/asm/linkage.h
create mode 100644 arch/arc/include/asm/mach_desc.h
create mode 100644 arch/arc/include/asm/mmu.h
create mode 100644 arch/arc/include/asm/mmu_context.h
create mode 100644 arch/arc/include/asm/module.h
create mode 100644 arch/arc/include/asm/mutex.h
create mode 100644 arch/arc/include/asm/page.h
create mode 100644 arch/arc/include/asm/perf_event.h
create mode 100644 arch/arc/include/asm/pgalloc.h
create mode 100644 arch/arc/include/asm/pgtable.h
create mode 100644 arch/arc/include/asm/processor.h
create mode 100644 arch/arc/include/asm/prom.h
create mode 100644 arch/arc/include/asm/ptrace.h
create mode 100644 arch/arc/include/asm/sections.h
create mode 100644 arch/arc/include/asm/segment.h
create mode 100644 arch/arc/include/asm/serial.h
create mode 100644 arch/arc/include/asm/setup.h
create mode 100644 arch/arc/include/asm/smp.h
create mode 100644 arch/arc/include/asm/spinlock.h
create mode 100644 arch/arc/include/asm/spinlock_types.h
create mode 100644 arch/arc/include/asm/string.h
create mode 100644 arch/arc/include/asm/switch_to.h
create mode 100644 arch/arc/include/asm/syscall.h
create mode 100644 arch/arc/include/asm/syscalls.h
create mode 100644 arch/arc/include/asm/thread_info.h
create mode 100644 arch/arc/include/asm/timex.h
create mode 100644 arch/arc/include/asm/tlb-mmu1.h
create mode 100644 arch/arc/include/asm/tlb.h
create mode 100644 arch/arc/include/asm/tlbflush.h
create mode 100644 arch/arc/include/asm/uaccess.h
create mode 100644 arch/arc/include/asm/unaligned.h
create mode 100644 arch/arc/include/asm/unwind.h
create mode 100644 arch/arc/include/uapi/asm/Kbuild
create mode 100644 arch/arc/include/uapi/asm/byteorder.h
create mode 100644 arch/arc/include/uapi/asm/cachectl.h
create mode 100644 arch/arc/include/uapi/asm/elf.h
create mode 100644 arch/arc/include/uapi/asm/page.h
create mode 100644 arch/arc/include/uapi/asm/ptrace.h
create mode 100644 arch/arc/include/uapi/asm/setup.h
create mode 100644 arch/arc/include/uapi/asm/sigcontext.h
create mode 100644 arch/arc/include/uapi/asm/signal.h
create mode 100644 arch/arc/include/uapi/asm/swab.h
create mode 100644 arch/arc/include/uapi/asm/unistd.h
create mode 100644 arch/arc/kernel/Makefile
create mode 100644 arch/arc/kernel/arc_hostlink.c
create mode 100644 arch/arc/kernel/arcksyms.c
create mode 100644 arch/arc/kernel/asm-offsets.c
create mode 100644 arch/arc/kernel/clk.c
create mode 100644 arch/arc/kernel/ctx_sw.c
create mode 100644 arch/arc/kernel/ctx_sw_asm.S
create mode 100644 arch/arc/kernel/devtree.c
create mode 100644 arch/arc/kernel/disasm.c
create mode 100644 arch/arc/kernel/entry.S
create mode 100644 arch/arc/kernel/fpu.c
create mode 100644 arch/arc/kernel/head.S
create mode 100644 arch/arc/kernel/irq.c
create mode 100644 arch/arc/kernel/kgdb.c
create mode 100644 arch/arc/kernel/kprobes.c
create mode 100644 arch/arc/kernel/module.c
create mode 100644 arch/arc/kernel/process.c
create mode 100644 arch/arc/kernel/ptrace.c
create mode 100644 arch/arc/kernel/reset.c
create mode 100644 arch/arc/kernel/setup.c
create mode 100644 arch/arc/kernel/signal.c
create mode 100644 arch/arc/kernel/smp.c
create mode 100644 arch/arc/kernel/stacktrace.c
create mode 100644 arch/arc/kernel/sys.c
create mode 100644 arch/arc/kernel/time.c
create mode 100644 arch/arc/kernel/traps.c
create mode 100644 arch/arc/kernel/troubleshoot.c
create mode 100644 arch/arc/kernel/unaligned.c
create mode 100644 arch/arc/kernel/unwind.c
create mode 100644 arch/arc/kernel/vmlinux.lds.S
create mode 100644 arch/arc/lib/Makefile
create mode 100644 arch/arc/lib/memcmp.S
create mode 100644 arch/arc/lib/memcpy-700.S
create mode 100644 arch/arc/lib/memset.S
create mode 100644 arch/arc/lib/strchr-700.S
create mode 100644 arch/arc/lib/strcmp.S
create mode 100644 arch/arc/lib/strcpy-700.S
create mode 100644 arch/arc/lib/strlen.S
create mode 100644 arch/arc/mm/Makefile
create mode 100644 arch/arc/mm/cache_arc700.c
create mode 100644 arch/arc/mm/dma.c
create mode 100644 arch/arc/mm/extable.c
create mode 100644 arch/arc/mm/fault.c
create mode 100644 arch/arc/mm/init.c
create mode 100644 arch/arc/mm/ioremap.c
create mode 100644 arch/arc/mm/tlb.c
create mode 100644 arch/arc/mm/tlbex.S
create mode 100644 arch/arc/oprofile/Makefile
create mode 100644 arch/arc/oprofile/common.c
create mode 100644 arch/arc/plat-arcfpga/Kconfig
create mode 100644 arch/arc/plat-arcfpga/Makefile
create mode 100644 arch/arc/plat-arcfpga/include/plat/irq.h
create mode 100644 arch/arc/plat-arcfpga/include/plat/memmap.h
create mode 100644 arch/arc/plat-arcfpga/include/plat/smp.h
create mode 100644 arch/arc/plat-arcfpga/irq.c
create mode 100644 arch/arc/plat-arcfpga/platform.c
create mode 100644 arch/arc/plat-arcfpga/smp.c
Merging arm/for-next (3576216 Merge branches 'devel-stable', 'fixes' and 'mmci' into for-next)
$ git merge arm/for-next
Auto-merging arch/arm/kernel/smp.c
Merge made by the 'recursive' strategy.
arch/arm/kernel/smp.c | 2 --
1 file changed, 2 deletions(-)
Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf)
$ git merge arm-perf/for-next/perf
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
$ git merge davinci/davinci-next
Already up-to-date.
Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask)
$ git merge xilinx/arm-next
Resolved 'arch/arm/mach-zynq/common.c' using previous resolution.
Auto-merging arch/arm/mach-zynq/common.c
CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7d4c6c0] Merge remote-tracking branch 'xilinx/arm-next'
$ git diff -M --stat --summary HEAD^..
Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process)
$ git merge arm64/upstream
Already up-to-date.
Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/)
$ git merge cris/for-next
Already up-to-date.
Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (c9500a7 Merge branch 'pstore' into next)
$ git merge ia64/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (8a67f21 m68knommu: fix trap on execing /bin/init)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
Merging metag/for-next (2149e40 metag: remove SET_PERSONALITY())
$ git merge metag/for-next
Resolved 'drivers/clocksource/Kconfig' using previous resolution.
Resolved 'drivers/clocksource/Makefile' using previous resolution.
Resolved 'drivers/irqchip/Makefile' using previous resolution.
Resolved 'tools/perf/perf.h' using previous resolution.
Auto-merging tools/perf/perf.h
CONFLICT (content): Merge conflict in tools/perf/perf.h
Auto-merging lib/Kconfig.debug
Auto-merging kernel/trace/ring_buffer.c
Auto-merging include/uapi/linux/elf.h
Auto-merging include/linux/mm.h
Auto-merging include/asm-generic/io.h
Auto-merging fs/binfmt_elf.c
Auto-merging drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
Auto-merging drivers/clocksource/Makefile
CONFLICT (content): Merge conflict in drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig
Auto-merging arch/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/00-INDEX
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 5607534] Merge remote-tracking branch 'metag/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/00-INDEX | 2 +
.../devicetree/bindings/metag/meta-intc.txt | 82 ++
Documentation/kernel-parameters.txt | 4 +
Documentation/metag/00-INDEX | 4 +
Documentation/metag/kernel-ABI.txt | 256 ++++
MAINTAINERS | 12 +
arch/Kconfig | 16 +
arch/metag/Kconfig | 293 ++++
arch/metag/Kconfig.debug | 40 +
arch/metag/Kconfig.soc | 55 +
arch/metag/Makefile | 87 ++
arch/metag/boot/.gitignore | 4 +
arch/metag/boot/Makefile | 68 +
arch/metag/boot/dts/Makefile | 16 +
arch/metag/boot/dts/skeleton.dts | 10 +
arch/metag/boot/dts/skeleton.dtsi | 14 +
arch/metag/configs/meta1_defconfig | 40 +
arch/metag/configs/meta2_defconfig | 41 +
arch/metag/configs/meta2_smp_defconfig | 42 +
arch/metag/include/asm/Kbuild | 54 +
arch/metag/include/asm/atomic.h | 53 +
arch/metag/include/asm/atomic_lnkget.h | 234 ++++
arch/metag/include/asm/atomic_lock1.h | 160 +++
arch/metag/include/asm/barrier.h | 85 ++
arch/metag/include/asm/bitops.h | 132 ++
arch/metag/include/asm/bug.h | 12 +
arch/metag/include/asm/cache.h | 23 +
arch/metag/include/asm/cacheflush.h | 250 ++++
arch/metag/include/asm/cachepart.h | 42 +
arch/metag/include/asm/checksum.h | 92 ++
arch/metag/include/asm/clock.h | 51 +
arch/metag/include/asm/cmpxchg.h | 65 +
arch/metag/include/asm/cmpxchg_irq.h | 42 +
arch/metag/include/asm/cmpxchg_lnkget.h | 86 ++
arch/metag/include/asm/cmpxchg_lock1.h | 48 +
arch/metag/include/asm/core_reg.h | 35 +
arch/metag/include/asm/cpu.h | 14 +
arch/metag/include/asm/da.h | 43 +
arch/metag/include/asm/delay.h | 29 +
arch/metag/include/asm/div64.h | 12 +
arch/metag/include/asm/dma-mapping.h | 190 +++
arch/metag/include/asm/elf.h | 125 ++
arch/metag/include/asm/fixmap.h | 99 ++
arch/metag/include/asm/ftrace.h | 23 +
arch/metag/include/asm/global_lock.h | 100 ++
arch/metag/include/asm/gpio.h | 4 +
arch/metag/include/asm/highmem.h | 62 +
arch/metag/include/asm/hugetlb.h | 86 ++
arch/metag/include/asm/hwthread.h | 40 +
arch/metag/include/asm/io.h | 165 +++
arch/metag/include/asm/irq.h | 32 +
arch/metag/include/asm/irqflags.h | 93 ++
arch/metag/include/asm/l2cache.h | 258 ++++
arch/metag/include/asm/linkage.h | 7 +
arch/metag/include/asm/mach/arch.h | 86 ++
arch/metag/include/asm/metag_isa.h | 81 ++
arch/metag/include/asm/metag_mem.h | 1106 +++++++++++++++
arch/metag/include/asm/metag_regs.h | 1184 ++++++++++++++++
arch/metag/include/asm/mman.h | 11 +
arch/metag/include/asm/mmu.h | 77 ++
arch/metag/include/asm/mmu_context.h | 113 ++
arch/metag/include/asm/mmzone.h | 42 +
arch/metag/include/asm/module.h | 37 +
arch/metag/include/asm/page.h | 128 ++
arch/metag/include/asm/perf_event.h | 4 +
arch/metag/include/asm/pgalloc.h | 79 ++
arch/metag/include/asm/pgtable.h | 370 +++++
arch/metag/include/asm/processor.h | 202 +++
arch/metag/include/asm/prom.h | 23 +
arch/metag/include/asm/ptrace.h | 60 +
arch/metag/include/asm/setup.h | 8 +
arch/metag/include/asm/smp.h | 29 +
arch/metag/include/asm/sparsemem.h | 13 +
arch/metag/include/asm/spinlock.h | 22 +
arch/metag/include/asm/spinlock_lnkget.h | 249 ++++
arch/metag/include/asm/spinlock_lock1.h | 184 +++
arch/metag/include/asm/spinlock_types.h | 20 +
arch/metag/include/asm/stacktrace.h | 20 +
arch/metag/include/asm/string.h | 13 +
arch/metag/include/asm/switch.h | 21 +
arch/metag/include/asm/syscall.h | 104 ++
arch/metag/include/asm/syscalls.h | 39 +
arch/metag/include/asm/tbx.h | 1425 ++++++++++++++++++++
arch/metag/include/asm/tcm.h | 30 +
arch/metag/include/asm/thread_info.h | 155 +++
arch/metag/include/asm/tlb.h | 36 +
arch/metag/include/asm/tlbflush.h | 77 ++
arch/metag/include/asm/topology.h | 53 +
arch/metag/include/asm/traps.h | 48 +
arch/metag/include/asm/uaccess.h | 241 ++++
arch/metag/include/asm/unistd.h | 12 +
arch/metag/include/asm/user_gateway.h | 44 +
arch/metag/include/uapi/asm/Kbuild | 13 +
arch/metag/include/uapi/asm/byteorder.h | 1 +
arch/metag/include/uapi/asm/ptrace.h | 113 ++
arch/metag/include/uapi/asm/resource.h | 7 +
arch/metag/include/uapi/asm/sigcontext.h | 31 +
arch/metag/include/uapi/asm/siginfo.h | 8 +
arch/metag/include/uapi/asm/swab.h | 26 +
arch/metag/include/uapi/asm/unistd.h | 21 +
arch/metag/kernel/.gitignore | 1 +
arch/metag/kernel/Makefile | 39 +
arch/metag/kernel/asm-offsets.c | 14 +
arch/metag/kernel/cachepart.c | 124 ++
arch/metag/kernel/clock.c | 53 +
arch/metag/kernel/core_reg.c | 117 ++
arch/metag/kernel/da.c | 23 +
arch/metag/kernel/devtree.c | 114 ++
arch/metag/kernel/dma.c | 507 +++++++
arch/metag/kernel/ftrace.c | 126 ++
arch/metag/kernel/ftrace_stub.S | 76 ++
arch/metag/kernel/head.S | 57 +
arch/metag/kernel/irq.c | 323 +++++
arch/metag/kernel/kick.c | 101 ++
arch/metag/kernel/machines.c | 20 +
arch/metag/kernel/metag_ksyms.c | 48 +
arch/metag/kernel/module.c | 284 ++++
arch/metag/kernel/perf/Makefile | 3 +
arch/metag/kernel/perf/perf_event.c | 861 ++++++++++++
arch/metag/kernel/perf/perf_event.h | 106 ++
arch/metag/kernel/perf_callchain.c | 96 ++
arch/metag/kernel/process.c | 461 +++++++
arch/metag/kernel/ptrace.c | 380 ++++++
arch/metag/kernel/setup.c | 631 +++++++++
arch/metag/kernel/signal.c | 344 +++++
arch/metag/kernel/smp.c | 575 ++++++++
arch/metag/kernel/stacktrace.c | 187 +++
arch/metag/kernel/sys_metag.c | 180 +++
arch/metag/kernel/tbiunexp.S | 22 +
arch/metag/kernel/tcm.c | 151 +++
arch/metag/kernel/time.c | 15 +
arch/metag/kernel/topology.c | 77 ++
arch/metag/kernel/traps.c | 995 ++++++++++++++
arch/metag/kernel/user_gateway.S | 97 ++
arch/metag/kernel/vmlinux.lds.S | 71 +
arch/metag/lib/Makefile | 22 +
arch/metag/lib/ashldi3.S | 33 +
arch/metag/lib/ashrdi3.S | 33 +
arch/metag/lib/checksum.c | 168 +++
arch/metag/lib/clear_page.S | 17 +
arch/metag/lib/cmpdi2.S | 32 +
arch/metag/lib/copy_page.S | 20 +
arch/metag/lib/delay.c | 56 +
arch/metag/lib/div64.S | 108 ++
arch/metag/lib/divsi3.S | 100 ++
arch/metag/lib/ip_fast_csum.S | 32 +
arch/metag/lib/lshrdi3.S | 33 +
arch/metag/lib/memcpy.S | 185 +++
arch/metag/lib/memmove.S | 345 +++++
arch/metag/lib/memset.S | 86 ++
arch/metag/lib/modsi3.S | 38 +
arch/metag/lib/muldi3.S | 44 +
arch/metag/lib/ucmpdi2.S | 27 +
arch/metag/lib/usercopy.c | 1354 +++++++++++++++++++
arch/metag/mm/Kconfig | 153 +++
arch/metag/mm/Makefile | 19 +
arch/metag/mm/cache.c | 521 +++++++
arch/metag/mm/extable.c | 15 +
arch/metag/mm/fault.c | 239 ++++
arch/metag/mm/highmem.c | 133 ++
arch/metag/mm/hugetlbpage.c | 259 ++++
arch/metag/mm/init.c | 451 +++++++
arch/metag/mm/ioremap.c | 89 ++
arch/metag/mm/l2cache.c | 192 +++
arch/metag/mm/maccess.c | 68 +
arch/metag/mm/mmu-meta1.c | 157 +++
arch/metag/mm/mmu-meta2.c | 207 +++
arch/metag/mm/numa.c | 81 ++
arch/metag/tbx/Makefile | 21 +
arch/metag/tbx/tbicore.S | 136 ++
arch/metag/tbx/tbictx.S | 366 +++++
arch/metag/tbx/tbictxfpu.S | 190 +++
arch/metag/tbx/tbidefr.S | 175 +++
arch/metag/tbx/tbidspram.S | 161 +++
arch/metag/tbx/tbilogf.S | 48 +
arch/metag/tbx/tbipcx.S | 451 +++++++
arch/metag/tbx/tbiroot.S | 87 ++
arch/metag/tbx/tbisoft.S | 237 ++++
arch/metag/tbx/tbistring.c | 114 ++
arch/metag/tbx/tbitimer.S | 207 +++
drivers/clocksource/Kconfig | 5 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/metag_generic.c | 198 +++
drivers/irqchip/Makefile | 2 +
drivers/irqchip/irq-metag-ext.c | 868 ++++++++++++
drivers/irqchip/irq-metag.c | 343 +++++
fs/binfmt_elf.c | 4 +
include/asm-generic/io.h | 2 +
include/asm-generic/unistd.h | 9 +-
include/clocksource/metag_generic.h | 21 +
include/linux/irqchip/metag-ext.h | 33 +
include/linux/irqchip/metag.h | 24 +
include/linux/mm.h | 2 +
include/uapi/linux/elf.h | 2 +
kernel/trace/ring_buffer.c | 6 +-
lib/Kconfig.debug | 4 +-
scripts/checkstack.pl | 8 +-
scripts/genksyms/genksyms.c | 3 +-
scripts/recordmcount.c | 13 +
tools/perf/perf.h | 6 +
200 files changed, 26933 insertions(+), 8 deletions(-)
create mode 100644 Documentation/devicetree/bindings/metag/meta-intc.txt
create mode 100644 Documentation/metag/00-INDEX
create mode 100644 Documentation/metag/kernel-ABI.txt
create mode 100644 arch/metag/Kconfig
create mode 100644 arch/metag/Kconfig.debug
create mode 100644 arch/metag/Kconfig.soc
create mode 100644 arch/metag/Makefile
create mode 100644 arch/metag/boot/.gitignore
create mode 100644 arch/metag/boot/Makefile
create mode 100644 arch/metag/boot/dts/Makefile
create mode 100644 arch/metag/boot/dts/skeleton.dts
create mode 100644 arch/metag/boot/dts/skeleton.dtsi
create mode 100644 arch/metag/configs/meta1_defconfig
create mode 100644 arch/metag/configs/meta2_defconfig
create mode 100644 arch/metag/configs/meta2_smp_defconfig
create mode 100644 arch/metag/include/asm/Kbuild
create mode 100644 arch/metag/include/asm/atomic.h
create mode 100644 arch/metag/include/asm/atomic_lnkget.h
create mode 100644 arch/metag/include/asm/atomic_lock1.h
create mode 100644 arch/metag/include/asm/barrier.h
create mode 100644 arch/metag/include/asm/bitops.h
create mode 100644 arch/metag/include/asm/bug.h
create mode 100644 arch/metag/include/asm/cache.h
create mode 100644 arch/metag/include/asm/cacheflush.h
create mode 100644 arch/metag/include/asm/cachepart.h
create mode 100644 arch/metag/include/asm/checksum.h
create mode 100644 arch/metag/include/asm/clock.h
create mode 100644 arch/metag/include/asm/cmpxchg.h
create mode 100644 arch/metag/include/asm/cmpxchg_irq.h
create mode 100644 arch/metag/include/asm/cmpxchg_lnkget.h
create mode 100644 arch/metag/include/asm/cmpxchg_lock1.h
create mode 100644 arch/metag/include/asm/core_reg.h
create mode 100644 arch/metag/include/asm/cpu.h
create mode 100644 arch/metag/include/asm/da.h
create mode 100644 arch/metag/include/asm/delay.h
create mode 100644 arch/metag/include/asm/div64.h
create mode 100644 arch/metag/include/asm/dma-mapping.h
create mode 100644 arch/metag/include/asm/elf.h
create mode 100644 arch/metag/include/asm/fixmap.h
create mode 100644 arch/metag/include/asm/ftrace.h
create mode 100644 arch/metag/include/asm/global_lock.h
create mode 100644 arch/metag/include/asm/gpio.h
create mode 100644 arch/metag/include/asm/highmem.h
create mode 100644 arch/metag/include/asm/hugetlb.h
create mode 100644 arch/metag/include/asm/hwthread.h
create mode 100644 arch/metag/include/asm/io.h
create mode 100644 arch/metag/include/asm/irq.h
create mode 100644 arch/metag/include/asm/irqflags.h
create mode 100644 arch/metag/include/asm/l2cache.h
create mode 100644 arch/metag/include/asm/linkage.h
create mode 100644 arch/metag/include/asm/mach/arch.h
create mode 100644 arch/metag/include/asm/metag_isa.h
create mode 100644 arch/metag/include/asm/metag_mem.h
create mode 100644 arch/metag/include/asm/metag_regs.h
create mode 100644 arch/metag/include/asm/mman.h
create mode 100644 arch/metag/include/asm/mmu.h
create mode 100644 arch/metag/include/asm/mmu_context.h
create mode 100644 arch/metag/include/asm/mmzone.h
create mode 100644 arch/metag/include/asm/module.h
create mode 100644 arch/metag/include/asm/page.h
create mode 100644 arch/metag/include/asm/perf_event.h
create mode 100644 arch/metag/include/asm/pgalloc.h
create mode 100644 arch/metag/include/asm/pgtable.h
create mode 100644 arch/metag/include/asm/processor.h
create mode 100644 arch/metag/include/asm/prom.h
create mode 100644 arch/metag/include/asm/ptrace.h
create mode 100644 arch/metag/include/asm/setup.h
create mode 100644 arch/metag/include/asm/smp.h
create mode 100644 arch/metag/include/asm/sparsemem.h
create mode 100644 arch/metag/include/asm/spinlock.h
create mode 100644 arch/metag/include/asm/spinlock_lnkget.h
create mode 100644 arch/metag/include/asm/spinlock_lock1.h
create mode 100644 arch/metag/include/asm/spinlock_types.h
create mode 100644 arch/metag/include/asm/stacktrace.h
create mode 100644 arch/metag/include/asm/string.h
create mode 100644 arch/metag/include/asm/switch.h
create mode 100644 arch/metag/include/asm/syscall.h
create mode 100644 arch/metag/include/asm/syscalls.h
create mode 100644 arch/metag/include/asm/tbx.h
create mode 100644 arch/metag/include/asm/tcm.h
create mode 100644 arch/metag/include/asm/thread_info.h
create mode 100644 arch/metag/include/asm/tlb.h
create mode 100644 arch/metag/include/asm/tlbflush.h
create mode 100644 arch/metag/include/asm/topology.h
create mode 100644 arch/metag/include/asm/traps.h
create mode 100644 arch/metag/include/asm/uaccess.h
create mode 100644 arch/metag/include/asm/unistd.h
create mode 100644 arch/metag/include/asm/user_gateway.h
create mode 100644 arch/metag/include/uapi/asm/Kbuild
create mode 100644 arch/metag/include/uapi/asm/byteorder.h
create mode 100644 arch/metag/include/uapi/asm/ptrace.h
create mode 100644 arch/metag/include/uapi/asm/resource.h
create mode 100644 arch/metag/include/uapi/asm/sigcontext.h
create mode 100644 arch/metag/include/uapi/asm/siginfo.h
create mode 100644 arch/metag/include/uapi/asm/swab.h
create mode 100644 arch/metag/include/uapi/asm/unistd.h
create mode 100644 arch/metag/kernel/.gitignore
create mode 100644 arch/metag/kernel/Makefile
create mode 100644 arch/metag/kernel/asm-offsets.c
create mode 100644 arch/metag/kernel/cachepart.c
create mode 100644 arch/metag/kernel/clock.c
create mode 100644 arch/metag/kernel/core_reg.c
create mode 100644 arch/metag/kernel/da.c
create mode 100644 arch/metag/kernel/devtree.c
create mode 100644 arch/metag/kernel/dma.c
create mode 100644 arch/metag/kernel/ftrace.c
create mode 100644 arch/metag/kernel/ftrace_stub.S
create mode 100644 arch/metag/kernel/head.S
create mode 100644 arch/metag/kernel/irq.c
create mode 100644 arch/metag/kernel/kick.c
create mode 100644 arch/metag/kernel/machines.c
create mode 100644 arch/metag/kernel/metag_ksyms.c
create mode 100644 arch/metag/kernel/module.c
create mode 100644 arch/metag/kernel/perf/Makefile
create mode 100644 arch/metag/kernel/perf/perf_event.c
create mode 100644 arch/metag/kernel/perf/perf_event.h
create mode 100644 arch/metag/kernel/perf_callchain.c
create mode 100644 arch/metag/kernel/process.c
create mode 100644 arch/metag/kernel/ptrace.c
create mode 100644 arch/metag/kernel/setup.c
create mode 100644 arch/metag/kernel/signal.c
create mode 100644 arch/metag/kernel/smp.c
create mode 100644 arch/metag/kernel/stacktrace.c
create mode 100644 arch/metag/kernel/sys_metag.c
create mode 100644 arch/metag/kernel/tbiunexp.S
create mode 100644 arch/metag/kernel/tcm.c
create mode 100644 arch/metag/kernel/time.c
create mode 100644 arch/metag/kernel/topology.c
create mode 100644 arch/metag/kernel/traps.c
create mode 100644 arch/metag/kernel/user_gateway.S
create mode 100644 arch/metag/kernel/vmlinux.lds.S
create mode 100644 arch/metag/lib/Makefile
create mode 100644 arch/metag/lib/ashldi3.S
create mode 100644 arch/metag/lib/ashrdi3.S
create mode 100644 arch/metag/lib/checksum.c
create mode 100644 arch/metag/lib/clear_page.S
create mode 100644 arch/metag/lib/cmpdi2.S
create mode 100644 arch/metag/lib/copy_page.S
create mode 100644 arch/metag/lib/delay.c
create mode 100644 arch/metag/lib/div64.S
create mode 100644 arch/metag/lib/divsi3.S
create mode 100644 arch/metag/lib/ip_fast_csum.S
create mode 100644 arch/metag/lib/lshrdi3.S
create mode 100644 arch/metag/lib/memcpy.S
create mode 100644 arch/metag/lib/memmove.S
create mode 100644 arch/metag/lib/memset.S
create mode 100644 arch/metag/lib/modsi3.S
create mode 100644 arch/metag/lib/muldi3.S
create mode 100644 arch/metag/lib/ucmpdi2.S
create mode 100644 arch/metag/lib/usercopy.c
create mode 100644 arch/metag/mm/Kconfig
create mode 100644 arch/metag/mm/Makefile
create mode 100644 arch/metag/mm/cache.c
create mode 100644 arch/metag/mm/extable.c
create mode 100644 arch/metag/mm/fault.c
create mode 100644 arch/metag/mm/highmem.c
create mode 100644 arch/metag/mm/hugetlbpage.c
create mode 100644 arch/metag/mm/init.c
create mode 100644 arch/metag/mm/ioremap.c
create mode 100644 arch/metag/mm/l2cache.c
create mode 100644 arch/metag/mm/maccess.c
create mode 100644 arch/metag/mm/mmu-meta1.c
create mode 100644 arch/metag/mm/mmu-meta2.c
create mode 100644 arch/metag/mm/numa.c
create mode 100644 arch/metag/tbx/Makefile
create mode 100644 arch/metag/tbx/tbicore.S
create mode 100644 arch/metag/tbx/tbictx.S
create mode 100644 arch/metag/tbx/tbictxfpu.S
create mode 100644 arch/metag/tbx/tbidefr.S
create mode 100644 arch/metag/tbx/tbidspram.S
create mode 100644 arch/metag/tbx/tbilogf.S
create mode 100644 arch/metag/tbx/tbipcx.S
create mode 100644 arch/metag/tbx/tbiroot.S
create mode 100644 arch/metag/tbx/tbisoft.S
create mode 100644 arch/metag/tbx/tbistring.c
create mode 100644 arch/metag/tbx/tbitimer.S
create mode 100644 drivers/clocksource/metag_generic.c
create mode 100644 drivers/irqchip/irq-metag-ext.c
create mode 100644 drivers/irqchip/irq-metag.c
create mode 100644 include/clocksource/metag_generic.h
create mode 100644 include/linux/irqchip/metag-ext.h
create mode 100644 include/linux/irqchip/metag.h
Merging microblaze/next (711e5b4 asm-generic: io: Fix ioread16/32be and iowrite16/32be)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (19aa5ac Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Auto-merging drivers/tty/serial/Kconfig
Auto-merging drivers/net/ethernet/broadcom/bgmac.c
Auto-merging arch/mips/sni/a20r.c
Removing arch/mips/pnx8550/stb810/prom_init.c
Removing arch/mips/pnx8550/stb810/irqmap.c
Removing arch/mips/pnx8550/stb810/board_setup.c
Removing arch/mips/pnx8550/stb810/Makefile
Removing arch/mips/pnx8550/jbs/irqmap.c
Removing arch/mips/pnx8550/jbs/init.c
Removing arch/mips/pnx8550/jbs/board_setup.c
Removing arch/mips/pnx8550/jbs/Makefile
Removing arch/mips/pnx8550/common/time.c
Removing arch/mips/pnx8550/common/setup.c
Removing arch/mips/pnx8550/common/reset.c
Removing arch/mips/pnx8550/common/prom.c
Removing arch/mips/pnx8550/common/proc.c
Removing arch/mips/pnx8550/common/platform.c
Removing arch/mips/pnx8550/common/pci.c
Removing arch/mips/pnx8550/common/int.c
Removing arch/mips/pnx8550/common/Makefile
Removing arch/mips/pnx8550/Platform
Removing arch/mips/pnx8550/Makefile
Auto-merging arch/mips/pmcs-msp71xx/msp_usb.c
Auto-merging arch/mips/pmcs-msp71xx/msp_time.c
Auto-merging arch/mips/pmcs-msp71xx/msp_setup.c
Auto-merging arch/mips/pmcs-msp71xx/msp_serial.c
Auto-merging arch/mips/pmcs-msp71xx/msp_prom.c
Auto-merging arch/mips/pmcs-msp71xx/msp_pci.c
Auto-merging arch/mips/pmcs-msp71xx/msp_irq_slp.c
Auto-merging arch/mips/pmcs-msp71xx/msp_irq_per.c
Auto-merging arch/mips/pmcs-msp71xx/msp_irq_cic.c
Auto-merging arch/mips/pmcs-msp71xx/msp_irq.c
Removing arch/mips/pmc-sierra/Platform
Auto-merging arch/mips/pci/pci-lantiq.c
Removing arch/mips/pci/ops-pnx8550.c
Removing arch/mips/pci/fixup-pnx8550.c
Removing arch/mips/mti-sead3/sead3-memory.c
Auto-merging arch/mips/kernel/vpe.c
Auto-merging arch/mips/kernel/traps.c
Auto-merging arch/mips/kernel/syscall.c
CONFLICT (content): Merge conflict in arch/mips/kernel/syscall.c
Auto-merging arch/mips/kernel/signal_n32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal_n32.c
Auto-merging arch/mips/kernel/signal32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal32.c
Auto-merging arch/mips/kernel/signal.c
CONFLICT (content): Merge conflict in arch/mips/kernel/signal.c
Auto-merging arch/mips/kernel/scall64-o32.S
CONFLICT (content): Merge conflict in arch/mips/kernel/scall64-o32.S
Auto-merging arch/mips/kernel/scall64-n32.S
Auto-merging arch/mips/kernel/scall64-64.S
Auto-merging arch/mips/kernel/scall32-o32.S
Auto-merging arch/mips/kernel/rtlx.c
Auto-merging arch/mips/kernel/process.c
CONFLICT (content): Merge conflict in arch/mips/kernel/process.c
Auto-merging arch/mips/kernel/linux32.c
CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c
Auto-merging arch/mips/kernel/kprobes.c
Auto-merging arch/mips/include/uapi/asm/signal.h
Auto-merging arch/mips/include/asm/octeon/cvmx-helper-util.h
CONFLICT (content): Merge conflict in arch/mips/include/asm/octeon/cvmx-helper-util.h
Auto-merging arch/mips/include/asm/mach-ralink/war.h
Removing arch/mips/include/asm/mach-pnx8550/usb.h
Removing arch/mips/include/asm/mach-pnx8550/uart.h
Removing arch/mips/include/asm/mach-pnx8550/pci.h
Removing arch/mips/include/asm/mach-pnx8550/nand.h
Removing arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
Removing arch/mips/include/asm/mach-pnx8550/int.h
Removing arch/mips/include/asm/mach-pnx8550/glb.h
Removing arch/mips/include/asm/mach-pnx8550/cm.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/war.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_slp_int.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regs.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_regops.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_prom.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_pci.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_int.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_gpio_macros.h
Auto-merging arch/mips/include/asm/mach-pmcs-msp71xx/msp_cic_int.h
Auto-merging arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
Removing arch/mips/include/asm/mach-ath79/pci.h
Auto-merging arch/mips/include/asm/compat.h
RemovResolved 'arch/mips/cavium-octeon/executive/cvmx-helper-util.c' using previous resolution.
Resolved 'arch/mips/include/asm/octeon/cvmx-helper-util.h' using previous resolution.
Resolved 'arch/mips/kernel/linux32.c' using previous resolution.
Resolved 'arch/mips/kernel/process.c' using previous resolution.
Resolved 'arch/mips/kernel/scall64-o32.S' using previous resolution.
Resolved 'arch/mips/kernel/signal.c' using previous resolution.
Resolved 'arch/mips/kernel/signal32.c' using previous resolution.
Resolved 'arch/mips/kernel/signal_n32.c' using previous resolution.
Resolved 'arch/mips/kernel/syscall.c' using previous resolution.
ing arch/mips/configs/pnx8550_stb810_defconfig
Removing arch/mips/configs/pnx8550_jbs_defconfig
Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper-util.c
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-util.c
Auto-merging arch/mips/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4762766] Merge remote-tracking branch 'mips/mips-for-linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/mips/cpu_irq.txt | 47 +
.../devicetree/bindings/serial/lantiq_asc.txt | 16 +
arch/mips/Kbuild.platforms | 4 +-
arch/mips/Kconfig | 49 +-
arch/mips/Makefile | 2 +-
arch/mips/alchemy/Platform | 6 +-
arch/mips/alchemy/board-gpr.c | 12 +-
arch/mips/alchemy/board-mtx1.c | 8 +-
arch/mips/alchemy/common/dbdma.c | 14 +-
arch/mips/alchemy/common/gpiolib.c | 14 +-
arch/mips/alchemy/common/irq.c | 178 +--
arch/mips/alchemy/common/platform.c | 4 +-
arch/mips/alchemy/common/setup.c | 2 +-
arch/mips/alchemy/common/sleeper.S | 20 +-
arch/mips/alchemy/common/time.c | 2 +-
arch/mips/alchemy/common/usb.c | 2 +-
arch/mips/alchemy/devboards/bcsr.c | 2 +-
arch/mips/alchemy/devboards/db1000.c | 16 +-
arch/mips/alchemy/devboards/db1200.c | 28 +-
arch/mips/alchemy/devboards/db1300.c | 10 +-
arch/mips/alchemy/devboards/db1550.c | 18 +-
arch/mips/alchemy/devboards/pm.c | 2 +-
arch/mips/ar7/Platform | 6 +-
arch/mips/ar7/platform.c | 12 +-
arch/mips/ath79/Kconfig | 20 +-
arch/mips/ath79/Makefile | 1 +
arch/mips/ath79/clock.c | 80 +-
arch/mips/ath79/common.c | 4 +
arch/mips/ath79/dev-common.c | 9 +-
arch/mips/ath79/dev-usb.c | 126 ++-
arch/mips/ath79/dev-wmac.c | 30 +-
arch/mips/ath79/early_printk.c | 2 +
arch/mips/ath79/gpio.c | 52 +-
arch/mips/ath79/irq.c | 187 ++-
arch/mips/ath79/mach-ap121.c | 2 +-
arch/mips/ath79/mach-ap136.c | 156 +++
arch/mips/ath79/mach-ap81.c | 2 +-
arch/mips/ath79/mach-db120.c | 2 +-
arch/mips/ath79/mach-pb44.c | 6 +-
arch/mips/ath79/machtypes.h | 1 +
arch/mips/ath79/pci.c | 165 ++-
arch/mips/ath79/pci.h | 1 +
arch/mips/ath79/setup.c | 18 +-
arch/mips/bcm47xx/Makefile | 2 +-
arch/mips/bcm47xx/nvram.c | 163 ++-
arch/mips/bcm47xx/setup.c | 6 +-
arch/mips/bcm47xx/sprom.c | 26 +-
arch/mips/bcm47xx/wgt634u.c | 40 +-
arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 +-
arch/mips/bcm63xx/early_printk.c | 4 +-
arch/mips/boot/Makefile | 2 +-
arch/mips/boot/compressed/Makefile | 8 +-
arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 4 +-
arch/mips/boot/compressed/decompress.c | 4 +-
arch/mips/boot/compressed/head.S | 4 +-
arch/mips/boot/ecoff.h | 62 +-
arch/mips/boot/elf2ecoff.c | 8 +-
arch/mips/cavium-octeon/Kconfig | 9 +
arch/mips/cavium-octeon/Makefile | 3 +-
arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 10 +-
.../cavium-octeon/executive/cvmx-helper-board.c | 28 +-
.../cavium-octeon/executive/cvmx-helper-jtag.c | 4 +-
.../cavium-octeon/executive/cvmx-helper-rgmii.c | 22 +-
.../cavium-octeon/executive/cvmx-helper-sgmii.c | 4 +-
.../mips/cavium-octeon/executive/cvmx-helper-spi.c | 8 +-
.../cavium-octeon/executive/cvmx-helper-util.c | 34 +-
.../cavium-octeon/executive/cvmx-helper-xaui.c | 4 +-
arch/mips/cavium-octeon/executive/cvmx-helper.c | 10 +-
.../cavium-octeon/executive/cvmx-interrupt-rsl.c | 6 +-
arch/mips/cavium-octeon/executive/cvmx-l2c.c | 66 +-
arch/mips/cavium-octeon/executive/cvmx-pko.c | 28 +-
arch/mips/cavium-octeon/executive/cvmx-spi.c | 70 +-
arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 16 +-
arch/mips/cavium-octeon/oct_ilm.c | 206 ++++
arch/mips/cavium-octeon/octeon-irq.c | 4 +-
arch/mips/cavium-octeon/octeon-memcpy.S | 22 +-
arch/mips/cavium-octeon/octeon-platform.c | 2 +-
arch/mips/cavium-octeon/octeon_3xxx.dts | 34 +-
arch/mips/cavium-octeon/octeon_68xx.dts | 34 +-
arch/mips/cavium-octeon/octeon_boot.h | 14 +-
arch/mips/cavium-octeon/setup.c | 8 +-
arch/mips/cavium-octeon/smp.c | 10 +-
arch/mips/cobalt/led.c | 2 +-
arch/mips/cobalt/mtd.c | 2 +-
arch/mips/cobalt/rtc.c | 2 +-
arch/mips/configs/ath79_defconfig | 1 +
arch/mips/configs/pnx8550_jbs_defconfig | 98 --
arch/mips/configs/pnx8550_stb810_defconfig | 92 --
arch/mips/configs/rt305x_defconfig | 167 +++
arch/mips/dec/int-handler.S | 98 +-
arch/mips/dec/kn02xa-berr.c | 4 +-
arch/mips/dec/prom/call_o32.S | 2 +-
arch/mips/dec/prom/dectypes.h | 2 +-
arch/mips/dec/prom/init.c | 2 +-
arch/mips/dec/prom/memory.c | 2 +-
arch/mips/dec/setup.c | 4 +-
arch/mips/dec/wbflush.c | 6 +-
arch/mips/emma/markeins/irq.c | 2 +-
arch/mips/emma/markeins/platform.c | 2 +-
arch/mips/emma/markeins/setup.c | 2 +-
arch/mips/fw/arc/file.c | 4 +-
arch/mips/fw/arc/identify.c | 2 +-
arch/mips/fw/arc/memory.c | 2 +-
arch/mips/fw/arc/promlib.c | 2 +-
arch/mips/fw/lib/call_o32.S | 2 +-
arch/mips/fw/sni/sniprom.c | 16 +-
arch/mips/include/asm/abi.h | 8 +-
arch/mips/include/asm/addrspace.h | 6 +-
arch/mips/include/asm/asm.h | 98 +-
arch/mips/include/asm/atomic.h | 4 +-
arch/mips/include/asm/barrier.h | 10 +-
arch/mips/include/asm/bcache.h | 2 +-
arch/mips/include/asm/bitops.h | 22 +-
arch/mips/include/asm/bootinfo.h | 20 +-
arch/mips/include/asm/break.h | 26 +
arch/mips/include/asm/cacheops.h | 14 +-
arch/mips/include/asm/checksum.h | 2 +-
arch/mips/include/asm/cmpxchg.h | 6 +-
arch/mips/include/asm/compat-signal.h | 4 +-
arch/mips/include/asm/compat.h | 6 +-
arch/mips/include/asm/cpu-features.h | 38 +-
arch/mips/include/asm/cpu-info.h | 18 +-
arch/mips/include/asm/cpu.h | 37 +-
arch/mips/include/asm/dec/ioasic_addrs.h | 22 +-
arch/mips/include/asm/dec/kn01.h | 12 +-
arch/mips/include/asm/dec/kn02ca.h | 2 +-
arch/mips/include/asm/dec/prom.h | 2 +-
arch/mips/include/asm/dma-mapping.h | 2 +-
arch/mips/include/asm/dma.h | 112 +-
arch/mips/include/asm/elf.h | 30 +-
arch/mips/include/asm/emma/emma2rh.h | 112 +-
arch/mips/include/asm/emma/markeins.h | 2 +-
arch/mips/include/asm/fixmap.h | 4 +-
arch/mips/include/asm/floppy.h | 4 +-
arch/mips/include/asm/fpregdef.h | 10 +-
arch/mips/include/asm/fpu.h | 6 +-
arch/mips/include/asm/futex.h | 12 +-
arch/mips/include/asm/fw/arc/hinv.h | 10 +-
arch/mips/include/asm/fw/arc/types.h | 12 +-
arch/mips/include/asm/fw/cfe/cfe_api.h | 6 +-
arch/mips/include/asm/fw/cfe/cfe_error.h | 18 +-
arch/mips/include/asm/gcmpregs.h | 100 +-
arch/mips/include/asm/gic.h | 17 +-
arch/mips/include/asm/gio_device.h | 14 +-
arch/mips/include/asm/gt64120.h | 22 +-
arch/mips/include/asm/hazards.h | 8 +-
arch/mips/include/asm/highmem.h | 4 +-
arch/mips/include/asm/inst.h | 348 +-----
arch/mips/include/asm/io.h | 30 +-
arch/mips/include/asm/ip32/crime.h | 8 +-
arch/mips/include/asm/ip32/ip32_ints.h | 2 +-
arch/mips/include/asm/ip32/mace.h | 12 +-
arch/mips/include/asm/irq.h | 6 +-
arch/mips/include/asm/irq_cpu.h | 6 +
arch/mips/include/asm/isadep.h | 4 +-
arch/mips/include/asm/jazz.h | 166 +--
arch/mips/include/asm/jazzdma.h | 50 +-
arch/mips/include/asm/kmap_types.h | 2 +-
arch/mips/include/asm/kprobes.h | 2 +-
arch/mips/include/asm/lasat/eeprom.h | 12 +-
arch/mips/include/asm/lasat/lasat.h | 14 +-
arch/mips/include/asm/lasat/serial.h | 2 +-
arch/mips/include/asm/local.h | 6 +-
arch/mips/include/asm/m48t37.h | 2 +-
arch/mips/include/asm/mach-ar7/ar7.h | 18 +-
arch/mips/include/asm/mach-ar7/irq.h | 2 +-
arch/mips/include/asm/mach-ath79/ar71xx_regs.h | 132 ++-
arch/mips/include/asm/mach-ath79/ar933x_uart.h | 12 +-
arch/mips/include/asm/mach-ath79/ath79.h | 17 +
.../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +-
arch/mips/include/asm/mach-ath79/irq.h | 27 +-
arch/mips/include/asm/mach-ath79/pci.h | 28 -
arch/mips/include/asm/mach-au1x00/au1000.h | 198 ++--
arch/mips/include/asm/mach-au1x00/au1000_dma.h | 10 +-
arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +-
arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 16 +-
arch/mips/include/asm/mach-au1x00/au1xxx_ide.h | 22 +-
arch/mips/include/asm/mach-au1x00/au1xxx_psc.h | 8 +-
arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 20 +-
arch/mips/include/asm/mach-au1x00/gpio-au1300.h | 2 +-
.../asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} | 13 +-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 2 +-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 2 +-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_iudma.h | 2 +-
arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 24 +-
arch/mips/include/asm/mach-bcm63xx/irq.h | 2 +-
arch/mips/include/asm/mach-cavium-octeon/irq.h | 4 +-
.../asm/mach-cavium-octeon/kernel-entry-init.h | 36 +-
.../asm/mach-cobalt/cpu-feature-overrides.h | 4 +-
arch/mips/include/asm/mach-cobalt/mach-gt64120.h | 2 +-
arch/mips/include/asm/mach-db1x00/bcsr.h | 4 +-
arch/mips/include/asm/mach-db1x00/db1200.h | 2 +-
arch/mips/include/asm/mach-db1x00/db1300.h | 2 +-
arch/mips/include/asm/mach-emma2rh/irq.h | 2 +-
.../asm/mach-generic/cpu-feature-overrides.h | 2 +-
arch/mips/include/asm/mach-generic/floppy.h | 4 +-
arch/mips/include/asm/mach-generic/ide.h | 4 +-
arch/mips/include/asm/mach-generic/irq.h | 4 +-
arch/mips/include/asm/mach-generic/spaces.h | 2 +-
.../mips/include/asm/mach-ip27/kernel-entry-init.h | 4 +-
arch/mips/include/asm/mach-ip27/mmzone.h | 2 +-
arch/mips/include/asm/mach-ip27/topology.h | 2 +-
.../include/asm/mach-ip28/cpu-feature-overrides.h | 2 +-
arch/mips/include/asm/mach-ip28/spaces.h | 2 +-
arch/mips/include/asm/mach-ip32/dma-coherence.h | 2 +-
arch/mips/include/asm/mach-ip32/war.h | 2 +-
arch/mips/include/asm/mach-jazz/floppy.h | 2 +-
arch/mips/include/asm/mach-jz4740/clock.h | 2 +-
arch/mips/include/asm/mach-jz4740/dma.h | 10 +-
arch/mips/include/asm/mach-jz4740/gpio.h | 2 +-
arch/mips/include/asm/mach-jz4740/irq.h | 2 +-
arch/mips/include/asm/mach-jz4740/platform.h | 2 +-
arch/mips/include/asm/mach-jz4740/timer.h | 2 +-
.../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +-
arch/mips/include/asm/mach-lantiq/lantiq.h | 2 +
arch/mips/include/asm/mach-lantiq/war.h | 24 +-
arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 4 +-
arch/mips/include/asm/mach-lasat/mach-gt64120.h | 6 +-
.../asm/mach-loongson/cpu-feature-overrides.h | 8 +-
.../mips/include/asm/mach-loongson/cs5536/cs5536.h | 422 +++----
.../asm/mach-loongson/cs5536/cs5536_mfgpt.h | 2 +-
.../include/asm/mach-loongson/cs5536/cs5536_pci.h | 122 +-
.../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 4 +-
arch/mips/include/asm/mach-loongson/gpio.h | 4 +-
arch/mips/include/asm/mach-loongson/loongson.h | 50 +-
arch/mips/include/asm/mach-loongson/machine.h | 4 +-
arch/mips/include/asm/mach-loongson/mem.h | 4 +-
arch/mips/include/asm/mach-loongson1/irq.h | 4 +-
arch/mips/include/asm/mach-loongson1/loongson1.h | 4 +-
arch/mips/include/asm/mach-loongson1/platform.h | 4 +-
arch/mips/include/asm/mach-loongson1/prom.h | 4 +-
arch/mips/include/asm/mach-loongson1/regs-clk.h | 4 +-
arch/mips/include/asm/mach-loongson1/regs-wdt.h | 4 +-
.../include/asm/mach-malta/cpu-feature-overrides.h | 8 +-
arch/mips/include/asm/mach-malta/irq.h | 2 +-
arch/mips/include/asm/mach-malta/mach-gt64120.h | 2 +-
.../cpu-feature-overrides.h | 0
.../msp71xx => mach-pmcs-msp71xx}/gpio.h | 0
.../msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h | 110 +-
.../msp_gpio_macros.h | 4 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_int.h | 4 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_pci.h | 46 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_prom.h | 8 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_regops.h | 2 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_regs.h | 416 +++----
.../msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h | 96 +-
.../msp71xx => mach-pmcs-msp71xx}/msp_usb.h | 2 +-
.../msp71xx => mach-pmcs-msp71xx}/war.h | 4 +-
arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 18 +-
arch/mips/include/asm/mach-pnx833x/pnx833x.h | 12 +-
arch/mips/include/asm/mach-pnx8550/cm.h | 43 -
arch/mips/include/asm/mach-pnx8550/glb.h | 86 --
arch/mips/include/asm/mach-pnx8550/int.h | 140 ---
.../include/asm/mach-pnx8550/kernel-entry-init.h | 262 -----
arch/mips/include/asm/mach-pnx8550/nand.h | 121 --
arch/mips/include/asm/mach-pnx8550/pci.h | 185 ---
arch/mips/include/asm/mach-pnx8550/uart.h | 30 -
arch/mips/include/asm/mach-pnx8550/usb.h | 32 -
arch/mips/include/asm/mach-powertv/asic.h | 8 +-
arch/mips/include/asm/mach-powertv/asic_regs.h | 4 +-
arch/mips/include/asm/mach-powertv/dma-coherence.h | 2 +-
arch/mips/include/asm/mach-powertv/interrupts.h | 62 +-
arch/mips/include/asm/mach-ralink/ralink_regs.h | 39 +
arch/mips/include/asm/mach-ralink/rt305x.h | 139 +++
.../asm/{mach-pnx8550 => mach-ralink}/war.h | 7 +-
arch/mips/include/asm/mach-rc32434/ddr.h | 2 +-
arch/mips/include/asm/mach-rc32434/dma.h | 12 +-
arch/mips/include/asm/mach-rc32434/dma_v.h | 4 +-
arch/mips/include/asm/mach-rc32434/eth.h | 6 +-
arch/mips/include/asm/mach-rc32434/gpio.h | 6 +-
arch/mips/include/asm/mach-rc32434/irq.h | 12 +-
arch/mips/include/asm/mach-rc32434/pci.h | 60 +-
arch/mips/include/asm/mach-rc32434/rb.h | 6 +-
arch/mips/include/asm/mach-rc32434/rc32434.h | 2 +-
arch/mips/include/asm/mach-rc32434/timer.h | 18 +-
.../include/asm/mach-sead3/cpu-feature-overrides.h | 8 +-
arch/mips/include/asm/mach-sead3/irq.h | 2 +-
arch/mips/include/asm/mach-sibyte/war.h | 4 +-
arch/mips/include/asm/mach-wrppmc/mach-gt64120.h | 16 +-
arch/mips/include/asm/mc146818-time.h | 4 +-
arch/mips/include/asm/mips-boards/bonito64.h | 106 +-
arch/mips/include/asm/mips-boards/generic.h | 70 +-
arch/mips/include/asm/mips-boards/launch.h | 10 +-
arch/mips/include/asm/mips-boards/malta.h | 10 +-
arch/mips/include/asm/mips-boards/maltaint.h | 8 +-
arch/mips/include/asm/mips-boards/piix4.h | 8 +-
arch/mips/include/asm/mips-boards/prom.h | 6 +-
arch/mips/include/asm/mips-boards/sead3int.h | 4 +-
arch/mips/include/asm/mips-boards/sim.h | 14 +-
arch/mips/include/asm/mipsmtregs.h | 8 +-
arch/mips/include/asm/mipsregs.h | 735 ++++++------
arch/mips/include/asm/mmu_context.h | 6 +-
arch/mips/include/asm/msc01_ic.h | 174 +--
arch/mips/include/asm/netlogic/common.h | 16 +-
arch/mips/include/asm/netlogic/haldefs.h | 2 +-
arch/mips/include/asm/netlogic/mips-extns.h | 83 +-
arch/mips/include/asm/netlogic/xlp-hal/bridge.h | 4 +-
.../mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 2 +
arch/mips/include/asm/netlogic/xlp-hal/iomap.h | 48 +-
arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 46 +-
arch/mips/include/asm/netlogic/xlp-hal/pic.h | 118 +-
arch/mips/include/asm/netlogic/xlp-hal/sys.h | 160 +--
arch/mips/include/asm/netlogic/xlp-hal/uart.h | 4 +-
arch/mips/include/asm/netlogic/xlr/fmn.h | 242 ++--
arch/mips/include/asm/netlogic/xlr/iomap.h | 88 +-
arch/mips/include/asm/netlogic/xlr/msidef.h | 18 +-
arch/mips/include/asm/netlogic/xlr/pic.h | 58 +-
arch/mips/include/asm/nile4.h | 38 +-
arch/mips/include/asm/octeon/cvmx-address.h | 50 +-
arch/mips/include/asm/octeon/cvmx-bootinfo.h | 14 +-
arch/mips/include/asm/octeon/cvmx-bootmem.h | 72 +-
arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 44 +-
arch/mips/include/asm/octeon/cvmx-config.h | 30 +-
arch/mips/include/asm/octeon/cvmx-fau.h | 162 +--
arch/mips/include/asm/octeon/cvmx-fpa.h | 32 +-
arch/mips/include/asm/octeon/cvmx-helper-board.h | 16 +-
arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 4 +-
arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 4 +-
arch/mips/include/asm/octeon/cvmx-helper-util.h | 18 +-
arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 4 +-
arch/mips/include/asm/octeon/cvmx-helper.h | 12 +-
arch/mips/include/asm/octeon/cvmx-ipd.h | 14 +-
arch/mips/include/asm/octeon/cvmx-l2c.h | 210 ++--
arch/mips/include/asm/octeon/cvmx-mdio.h | 40 +-
arch/mips/include/asm/octeon/cvmx-pip-defs.h | 2 +-
arch/mips/include/asm/octeon/cvmx-pip.h | 62 +-
arch/mips/include/asm/octeon/cvmx-pko.h | 60 +-
arch/mips/include/asm/octeon/cvmx-pow.h | 122 +-
arch/mips/include/asm/octeon/cvmx-scratch.h | 2 +-
arch/mips/include/asm/octeon/cvmx-spi.h | 66 +-
arch/mips/include/asm/octeon/cvmx-spinlock.h | 78 +-
arch/mips/include/asm/octeon/cvmx-sysinfo.h | 16 +-
arch/mips/include/asm/octeon/cvmx-wqe.h | 104 +-
arch/mips/include/asm/octeon/cvmx.h | 48 +-
arch/mips/include/asm/octeon/octeon-feature.h | 10 +-
arch/mips/include/asm/octeon/octeon-model.h | 240 ++--
arch/mips/include/asm/octeon/octeon.h | 12 +-
arch/mips/include/asm/octeon/pci-octeon.h | 2 +-
arch/mips/include/asm/paccess.h | 2 +-
arch/mips/include/asm/page.h | 14 +-
arch/mips/include/asm/pci.h | 11 +-
arch/mips/include/asm/pci/bridge.h | 30 +-
arch/mips/include/asm/pgtable-32.h | 20 +-
arch/mips/include/asm/pgtable-64.h | 4 +-
arch/mips/include/asm/pgtable-bits.h | 42 +-
arch/mips/include/asm/pgtable.h | 4 +-
arch/mips/include/asm/processor.h | 46 +-
arch/mips/include/asm/r4kcache.h | 12 +-
arch/mips/include/asm/regdef.h | 66 +-
arch/mips/include/asm/rtlx.h | 2 +-
arch/mips/include/asm/seccomp.h | 2 +-
arch/mips/include/asm/sgi/gio.h | 16 +-
arch/mips/include/asm/sgi/hpc3.h | 82 +-
arch/mips/include/asm/sgi/ioc.h | 4 +-
arch/mips/include/asm/sgi/ip22.h | 6 +-
arch/mips/include/asm/sgi/mc.h | 26 +-
arch/mips/include/asm/sgi/pi1.h | 20 +-
arch/mips/include/asm/sgialib.h | 2 +-
arch/mips/include/asm/sgiarcs.h | 136 +--
arch/mips/include/asm/shmparam.h | 2 +-
arch/mips/include/asm/sibyte/bcm1480_int.h | 424 +++----
arch/mips/include/asm/sibyte/bcm1480_l2c.h | 138 +--
arch/mips/include/asm/sibyte/bcm1480_mc.h | 1192 ++++++++++----------
arch/mips/include/asm/sibyte/bcm1480_regs.h | 806 ++++++-------
arch/mips/include/asm/sibyte/bcm1480_scd.h | 276 ++---
arch/mips/include/asm/sibyte/bigsur.h | 20 +-
arch/mips/include/asm/sibyte/carmel.h | 52 +-
arch/mips/include/asm/sibyte/sb1250.h | 4 +-
arch/mips/include/asm/sibyte/sb1250_defs.h | 94 +-
arch/mips/include/asm/sibyte/sb1250_dma.h | 426 +++----
arch/mips/include/asm/sibyte/sb1250_genbus.h | 26 +-
arch/mips/include/asm/sibyte/sb1250_int.h | 274 ++---
arch/mips/include/asm/sibyte/sb1250_l2c.h | 92 +-
arch/mips/include/asm/sibyte/sb1250_ldt.h | 14 +-
arch/mips/include/asm/sibyte/sb1250_mac.h | 568 +++++-----
arch/mips/include/asm/sibyte/sb1250_mc.h | 712 ++++++------
arch/mips/include/asm/sibyte/sb1250_regs.h | 854 +++++++-------
arch/mips/include/asm/sibyte/sb1250_scd.h | 668 +++++------
arch/mips/include/asm/sibyte/sb1250_smbus.h | 158 +--
arch/mips/include/asm/sibyte/sb1250_syncser.h | 136 +--
arch/mips/include/asm/sibyte/sb1250_uart.h | 262 ++---
arch/mips/include/asm/sibyte/sentosa.h | 6 +-
arch/mips/include/asm/sibyte/swarm.h | 26 +-
arch/mips/include/asm/smp.h | 12 +-
arch/mips/include/asm/smtc.h | 4 +-
arch/mips/include/asm/sn/addrs.h | 54 +-
arch/mips/include/asm/sn/agent.h | 12 +-
arch/mips/include/asm/sn/arch.h | 8 +-
arch/mips/include/asm/sn/fru.h | 12 +-
arch/mips/include/asm/sn/gda.h | 24 +-
arch/mips/include/asm/sn/intr.h | 16 +-
arch/mips/include/asm/sn/io.h | 4 +-
arch/mips/include/asm/sn/ioc3.h | 8 +-
arch/mips/include/asm/sn/klconfig.h | 526 ++++-----
arch/mips/include/asm/sn/kldir.h | 182 +--
arch/mips/include/asm/sn/launch.h | 16 +-
arch/mips/include/asm/sn/mapped_kernel.h | 4 +-
arch/mips/include/asm/sn/nmi.h | 8 +-
arch/mips/include/asm/sn/sn0/addrs.h | 20 +-
arch/mips/include/asm/sn/sn0/arch.h | 22 +-
arch/mips/include/asm/sn/sn0/hub.h | 12 +-
arch/mips/include/asm/sn/sn0/hubio.h | 442 ++++----
arch/mips/include/asm/sn/sn0/hubmd.h | 214 ++--
arch/mips/include/asm/sn/sn0/hubni.h | 78 +-
arch/mips/include/asm/sn/sn0/hubpi.h | 184 +--
arch/mips/include/asm/sn/sn0/ip27.h | 28 +-
arch/mips/include/asm/sn/types.h | 4 +-
arch/mips/include/asm/sni.h | 104 +-
arch/mips/include/asm/sparsemem.h | 2 +-
arch/mips/include/asm/spinlock.h | 4 +-
arch/mips/include/asm/spinlock_types.h | 2 +-
arch/mips/include/asm/stackframe.h | 14 +-
arch/mips/include/asm/string.h | 8 +-
arch/mips/include/asm/switch_to.h | 4 +-
arch/mips/include/asm/thread_info.h | 2 +-
arch/mips/include/asm/time.h | 6 +-
arch/mips/include/asm/tlb.h | 2 +-
arch/mips/include/asm/topology.h | 2 +-
arch/mips/include/asm/traps.h | 2 +-
arch/mips/include/asm/txx9/jmr3927.h | 14 +-
arch/mips/include/asm/txx9/rbtx4927.h | 6 +-
arch/mips/include/asm/txx9/rbtx4938.h | 20 +-
arch/mips/include/asm/txx9/rbtx4939.h | 14 +-
arch/mips/include/asm/txx9/smsc_fdc37m81x.h | 54 +-
arch/mips/include/asm/txx9/tx3927.h | 16 +-
arch/mips/include/asm/txx9/tx4927.h | 18 +-
arch/mips/include/asm/txx9/tx4927pcic.h | 6 +-
arch/mips/include/asm/txx9/tx4938.h | 32 +-
arch/mips/include/asm/txx9/tx4939.h | 50 +-
arch/mips/include/asm/txx9tmr.h | 4 +-
arch/mips/include/asm/uaccess.h | 102 +-
arch/mips/include/asm/uasm.h | 2 +-
arch/mips/include/asm/user.h | 2 +-
arch/mips/include/asm/vr41xx/pci.h | 2 +-
arch/mips/include/asm/vr41xx/tb0287.h | 2 +-
arch/mips/include/asm/war.h | 46 +-
arch/mips/include/asm/xtalk/xtalk.h | 24 +-
arch/mips/include/asm/xtalk/xwidget.h | 8 +-
arch/mips/include/uapi/asm/Kbuild | 1 +
arch/mips/include/uapi/asm/break.h | 16 +-
arch/mips/include/uapi/asm/cachectl.h | 10 +-
arch/mips/include/uapi/asm/errno.h | 188 +--
arch/mips/include/uapi/asm/fcntl.h | 4 +-
arch/mips/include/uapi/asm/inst.h | 331 ++++++
arch/mips/include/uapi/asm/ioctls.h | 22 +-
arch/mips/include/uapi/asm/mman.h | 10 +-
arch/mips/include/uapi/asm/ptrace.h | 8 +-
arch/mips/include/uapi/asm/sembuf.h | 4 +-
arch/mips/include/uapi/asm/siginfo.h | 8 +-
arch/mips/include/uapi/asm/signal.h | 24 +-
arch/mips/include/uapi/asm/socket.h | 14 +-
arch/mips/include/uapi/asm/sockios.h | 2 +-
arch/mips/include/uapi/asm/stat.h | 2 +-
arch/mips/include/uapi/asm/statfs.h | 6 +-
arch/mips/include/uapi/asm/sysmips.h | 8 +-
arch/mips/include/uapi/asm/termbits.h | 158 +--
arch/mips/include/uapi/asm/termios.h | 12 +-
arch/mips/include/uapi/asm/unistd.h | 60 +-
arch/mips/jazz/Makefile | 2 +-
arch/mips/jazz/irq.c | 4 +-
arch/mips/jazz/jazzdma.c | 6 +-
arch/mips/jazz/setup.c | 20 +-
arch/mips/jz4740/board-qi_lb60.c | 8 +-
arch/mips/jz4740/clock-debugfs.c | 2 +-
arch/mips/jz4740/clock.c | 4 +-
arch/mips/jz4740/dma.c | 2 +-
arch/mips/jz4740/gpio.c | 2 +-
arch/mips/jz4740/irq.c | 2 +-
arch/mips/jz4740/irq.h | 2 +-
arch/mips/jz4740/platform.c | 12 +-
arch/mips/jz4740/pm.c | 2 +-
arch/mips/jz4740/prom.c | 2 +-
arch/mips/jz4740/reset.c | 2 +-
arch/mips/jz4740/setup.c | 2 +-
arch/mips/jz4740/time.c | 2 +-
arch/mips/jz4740/timer.c | 2 +-
arch/mips/kernel/Makefile | 36 +-
arch/mips/kernel/binfmt_elfn32.c | 10 +-
arch/mips/kernel/binfmt_elfo32.c | 10 +-
arch/mips/kernel/bmips_vec.S | 6 +-
arch/mips/kernel/branch.c | 10 +-
arch/mips/kernel/cevt-bcm1480.c | 4 +-
arch/mips/kernel/cevt-ds1287.c | 4 +-
arch/mips/kernel/cevt-gt641xx.c | 4 +-
arch/mips/kernel/cevt-r4k.c | 6 +-
arch/mips/kernel/cevt-sb1250.c | 4 +-
arch/mips/kernel/cevt-smtc.c | 2 +-
arch/mips/kernel/cevt-txx9.c | 6 +-
arch/mips/kernel/cpu-bugs64.c | 10 +-
arch/mips/kernel/cpu-probe.c | 132 ++-
arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 19 +-
arch/mips/kernel/crash.c | 2 +-
arch/mips/kernel/csrc-bcm1480.c | 2 +-
arch/mips/kernel/csrc-gic.c | 49 +
arch/mips/kernel/csrc-ioasic.c | 2 +-
arch/mips/kernel/csrc-powertv.c | 6 +-
arch/mips/kernel/csrc-sb1250.c | 2 +-
arch/mips/kernel/early_printk.c | 5 +-
arch/mips/kernel/ftrace.c | 12 +-
arch/mips/kernel/genex.S | 14 +-
arch/mips/kernel/head.S | 4 +-
arch/mips/kernel/i8259.c | 2 +-
arch/mips/kernel/irq-gt641xx.c | 4 +-
arch/mips/kernel/irq-msc01.c | 6 +-
arch/mips/kernel/irq-rm7000.c | 4 +-
arch/mips/kernel/irq.c | 2 +-
arch/mips/kernel/irq_cpu.c | 50 +-
arch/mips/kernel/irq_txx9.c | 10 +-
arch/mips/kernel/kgdb.c | 6 +-
arch/mips/kernel/kprobes.c | 10 +-
arch/mips/kernel/linux32.c | 10 +-
arch/mips/kernel/mips_ksyms.c | 4 +-
arch/mips/kernel/module-rela.c | 6 +-
arch/mips/kernel/module.c | 10 +-
arch/mips/kernel/octeon_switch.S | 104 +-
arch/mips/kernel/perf_event_mipsxx.c | 30 +-
arch/mips/kernel/proc.c | 26 +-
arch/mips/kernel/ptrace.c | 12 +-
arch/mips/kernel/ptrace32.c | 2 +-
arch/mips/kernel/r2300_fpu.S | 128 +--
arch/mips/kernel/r2300_switch.S | 2 +-
arch/mips/kernel/r4k_switch.S | 4 +-
arch/mips/kernel/relocate_kernel.S | 12 +-
arch/mips/kernel/rtlx.c | 18 +-
arch/mips/kernel/scall32-o32.S | 14 +-
arch/mips/kernel/scall64-64.S | 6 +-
arch/mips/kernel/scall64-n32.S | 10 +-
arch/mips/kernel/scall64-o32.S | 14 +-
arch/mips/kernel/setup.c | 101 +-
arch/mips/kernel/signal.c | 12 +-
arch/mips/kernel/signal32.c | 10 +-
arch/mips/kernel/signal_n32.c | 6 +-
arch/mips/kernel/smp-cmp.c | 2 +-
arch/mips/kernel/smp-mt.c | 4 +-
arch/mips/kernel/smtc-asm.S | 2 +-
arch/mips/kernel/smtc-proc.c | 6 +-
arch/mips/kernel/smtc.c | 21 +-
arch/mips/kernel/sync-r4k.c | 2 +-
arch/mips/kernel/syscall.c | 4 +-
arch/mips/kernel/time.c | 12 +-
arch/mips/kernel/traps.c | 32 +-
arch/mips/kernel/unaligned.c | 34 +-
arch/mips/kernel/vmlinux.lds.S | 8 +-
arch/mips/kernel/vpe.c | 113 +-
arch/mips/kernel/watch.c | 4 +-
arch/mips/lantiq/clk.c | 18 +-
arch/mips/lantiq/clk.h | 7 +-
arch/mips/lantiq/dts/danube.dtsi | 2 +-
arch/mips/lantiq/dts/easy50712.dts | 2 +-
arch/mips/lantiq/falcon/sysctrl.c | 4 +-
arch/mips/lantiq/irq.c | 105 +-
arch/mips/lantiq/prom.h | 2 +-
arch/mips/lantiq/xway/clk.c | 43 +
arch/mips/lantiq/xway/reset.c | 9 +
arch/mips/lantiq/xway/sysctrl.c | 15 +-
arch/mips/lasat/Makefile | 2 +-
arch/mips/lasat/ds1603.h | 2 +-
arch/mips/lasat/image/Makefile | 2 +-
arch/mips/lasat/image/head.S | 2 +-
arch/mips/lasat/picvue.c | 34 +-
arch/mips/lasat/picvue.h | 16 +-
arch/mips/lasat/serial.c | 2 +-
arch/mips/lasat/sysctl.c | 4 +-
arch/mips/lib/bitops.c | 4 +-
arch/mips/lib/csum_partial.S | 42 +-
arch/mips/lib/delay.c | 2 +-
arch/mips/lib/dump_tlb.c | 2 +-
arch/mips/lib/memcpy.S | 34 +-
arch/mips/lib/memset.S | 4 +-
arch/mips/lib/r3k_dump_tlb.c | 2 +-
arch/mips/lib/strncpy_user.S | 2 +-
arch/mips/lib/strnlen_user.S | 6 +-
arch/mips/lib/uncached.c | 2 +-
arch/mips/loongson/Makefile | 2 +-
arch/mips/loongson/common/bonito-irq.c | 6 +-
arch/mips/loongson/common/cmdline.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_acc.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_ehci.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_ide.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_isa.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 6 +-
arch/mips/loongson/common/cs5536/cs5536_ohci.c | 4 +-
arch/mips/loongson/common/cs5536/cs5536_pci.c | 4 +-
arch/mips/loongson/common/early_printk.c | 6 +-
arch/mips/loongson/common/env.c | 4 +-
arch/mips/loongson/common/gpio.c | 16 +-
arch/mips/loongson/common/init.c | 4 +-
arch/mips/loongson/common/irq.c | 6 +-
arch/mips/loongson/common/machtype.c | 20 +-
arch/mips/loongson/common/mem.c | 4 +-
arch/mips/loongson/common/pci.c | 34 +-
arch/mips/loongson/common/platform.c | 4 +-
arch/mips/loongson/common/reset.c | 10 +-
arch/mips/loongson/common/serial.c | 18 +-
arch/mips/loongson/common/setup.c | 6 +-
arch/mips/loongson/common/time.c | 6 +-
arch/mips/loongson/common/uart_base.c | 4 +-
arch/mips/loongson/fuloong-2e/irq.c | 12 +-
arch/mips/loongson/fuloong-2e/reset.c | 4 +-
arch/mips/loongson/lemote-2f/ec_kb3310b.h | 216 ++--
arch/mips/loongson/lemote-2f/irq.c | 20 +-
arch/mips/loongson/lemote-2f/machtype.c | 14 +-
arch/mips/loongson/lemote-2f/reset.c | 10 +-
arch/mips/loongson1/Platform | 2 +-
arch/mips/loongson1/common/clock.c | 4 +-
arch/mips/loongson1/common/irq.c | 4 +-
arch/mips/loongson1/common/platform.c | 6 +-
arch/mips/loongson1/common/prom.c | 6 +-
arch/mips/loongson1/common/reset.c | 4 +-
arch/mips/loongson1/common/setup.c | 4 +-
arch/mips/loongson1/ls1b/board.c | 4 +-
arch/mips/math-emu/Makefile | 1 -
arch/mips/math-emu/cp1emu.c | 8 +-
arch/mips/math-emu/dp_add.c | 2 +-
arch/mips/math-emu/dp_sqrt.c | 6 +-
arch/mips/math-emu/dp_sub.c | 2 +-
arch/mips/math-emu/ieee754.c | 18 +-
arch/mips/math-emu/ieee754dp.c | 2 +-
arch/mips/math-emu/ieee754int.h | 2 +-
arch/mips/math-emu/ieee754sp.c | 2 +-
arch/mips/math-emu/ieee754xcpt.c | 2 +-
arch/mips/math-emu/kernel_linkage.c | 2 +-
arch/mips/math-emu/sp_add.c | 2 +-
arch/mips/math-emu/sp_mul.c | 4 +-
arch/mips/math-emu/sp_sub.c | 2 +-
arch/mips/mm/Makefile | 6 +-
arch/mips/mm/c-octeon.c | 2 +-
arch/mips/mm/c-r3k.c | 8 +-
arch/mips/mm/c-r4k.c | 27 +-
arch/mips/mm/c-tx39.c | 12 +-
arch/mips/mm/cerr-sb1.c | 30 +-
arch/mips/mm/cex-gen.S | 6 +-
arch/mips/mm/cex-oct.S | 36 +-
arch/mips/mm/cex-sb1.S | 8 +-
arch/mips/mm/dma-default.c | 2 +-
arch/mips/mm/fault.c | 4 +-
arch/mips/mm/gup.c | 2 +-
arch/mips/mm/init.c | 4 +-
arch/mips/mm/ioremap.c | 4 +-
arch/mips/mm/page.c | 6 +-
arch/mips/mm/pgtable-64.c | 4 +-
arch/mips/mm/sc-ip22.c | 2 +-
arch/mips/mm/sc-r5k.c | 4 +-
arch/mips/mm/tlb-r4k.c | 2 +-
arch/mips/mm/tlbex.c | 33 +-
arch/mips/mm/uasm.c | 16 +-
arch/mips/mti-malta/malta-amon.c | 6 +-
arch/mips/mti-malta/malta-cmdline.c | 2 +-
arch/mips/mti-malta/malta-display.c | 6 +-
arch/mips/mti-malta/malta-init.c | 14 +-
arch/mips/mti-malta/malta-int.c | 40 +-
arch/mips/mti-malta/malta-memory.c | 4 +-
arch/mips/mti-malta/malta-pci.c | 6 +-
arch/mips/mti-malta/malta-platform.c | 2 +-
arch/mips/mti-malta/malta-setup.c | 4 +-
arch/mips/mti-malta/malta-smtc.c | 2 +-
arch/mips/mti-malta/malta-time.c | 83 +-
arch/mips/mti-sead3/Makefile | 10 +-
arch/mips/mti-sead3/leds-sead3.c | 5 +-
arch/mips/mti-sead3/sead3-console.c | 4 +-
arch/mips/mti-sead3/sead3-display.c | 2 +-
arch/mips/mti-sead3/sead3-i2c-drv.c | 28 +-
arch/mips/mti-sead3/sead3-init.c | 5 +-
arch/mips/mti-sead3/sead3-memory.c | 138 ---
arch/mips/mti-sead3/sead3-net.c | 4 +-
arch/mips/mti-sead3/sead3-pic32-bus.c | 6 +-
arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 58 +-
arch/mips/mti-sead3/sead3-setup.c | 27 +
arch/mips/mti-sead3/sead3-time.c | 8 +-
arch/mips/mti-sead3/sead3.dts | 26 +
arch/mips/netlogic/Platform | 4 +-
arch/mips/netlogic/common/irq.c | 43 +-
arch/mips/netlogic/common/smp.c | 8 +-
arch/mips/netlogic/common/smpboot.S | 20 +-
arch/mips/netlogic/common/time.c | 56 +
arch/mips/netlogic/dts/xlp_evp.dts | 2 +-
arch/mips/netlogic/xlp/nlm_hal.c | 4 +-
arch/mips/netlogic/xlp/usb-init.c | 2 +-
arch/mips/netlogic/xlp/wakeup.c | 35 +-
arch/mips/netlogic/xlr/fmn-config.c | 6 +-
arch/mips/netlogic/xlr/platform-flash.c | 12 +-
arch/mips/netlogic/xlr/platform.c | 12 +-
arch/mips/netlogic/xlr/setup.c | 4 +-
arch/mips/oprofile/common.c | 7 +-
arch/mips/oprofile/op_model_loongson2.c | 10 +-
arch/mips/oprofile/op_model_mipsxx.c | 38 +-
arch/mips/pci/Makefile | 5 +-
arch/mips/pci/fixup-cobalt.c | 28 +-
arch/mips/pci/fixup-emma2rh.c | 2 +-
arch/mips/pci/fixup-fuloong2e.c | 8 +-
arch/mips/pci/fixup-ip32.c | 14 +-
arch/mips/pci/fixup-lemote2f.c | 14 +-
arch/mips/pci/fixup-malta.c | 14 +-
arch/mips/pci/fixup-pmcmsp.c | 224 ++--
arch/mips/pci/fixup-pnx8550.c | 57 -
arch/mips/pci/fixup-sni.c | 68 +-
arch/mips/pci/fixup-tb0219.c | 2 +-
arch/mips/pci/fixup-tb0287.c | 2 +-
arch/mips/pci/fixup-wrppmc.c | 2 +-
arch/mips/pci/ops-bcm63xx.c | 16 +-
arch/mips/pci/ops-bonito64.c | 4 +-
arch/mips/pci/ops-gt64xxx_pci0.c | 24 +-
arch/mips/pci/ops-lantiq.c | 2 +-
arch/mips/pci/ops-loongson2.c | 2 +-
arch/mips/pci/ops-msc.c | 22 +-
arch/mips/pci/ops-nile4.c | 2 +-
arch/mips/pci/ops-pmcmsp.c | 450 ++++----
arch/mips/pci/ops-pnx8550.c | 282 -----
arch/mips/pci/ops-rc32434.c | 2 +-
arch/mips/pci/ops-sni.c | 8 +-
arch/mips/pci/ops-tx4927.c | 8 +-
arch/mips/pci/ops-vr41xx.c | 6 +-
arch/mips/pci/pci-alchemy.c | 6 +-
arch/mips/pci/pci-ar71xx.c | 194 ++--
arch/mips/pci/pci-ar724x.c | 304 +++--
arch/mips/pci/pci-bcm1480.c | 8 +-
arch/mips/pci/pci-bcm1480ht.c | 6 +-
arch/mips/pci/pci-bcm47xx.c | 2 +-
arch/mips/pci/pci-bcm63xx.c | 62 +-
arch/mips/pci/pci-bcm63xx.h | 2 +-
arch/mips/pci/pci-ip27.c | 8 +-
arch/mips/pci/pci-ip32.c | 6 +-
arch/mips/pci/pci-lantiq.c | 12 +-
arch/mips/pci/pci-lasat.c | 26 +-
arch/mips/pci/pci-octeon.c | 30 +-
arch/mips/pci/pci-rc32434.c | 6 +-
arch/mips/pci/pci-sb1250.c | 8 +-
arch/mips/pci/pci-vr41xx.c | 22 +-
arch/mips/pci/pci-vr41xx.h | 2 +-
arch/mips/pci/pci-xlp.c | 156 ++-
arch/mips/pci/pci-xlr.c | 34 +-
arch/mips/pci/pci.c | 19 +-
arch/mips/pci/pcie-octeon.c | 58 +-
arch/mips/pmc-sierra/Platform | 7 -
arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig | 0
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile | 0
arch/mips/pmcs-msp71xx/Platform | 7 +
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c | 0
.../msp71xx => pmcs-msp71xx}/gpio_extended.c | 0
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c | 0
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c | 0
.../msp71xx => pmcs-msp71xx}/msp_hwbutton.c | 0
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c | 4 +-
.../msp71xx => pmcs-msp71xx}/msp_irq_cic.c | 6 +-
.../msp71xx => pmcs-msp71xx}/msp_irq_per.c | 4 +-
.../msp71xx => pmcs-msp71xx}/msp_irq_slp.c | 4 +-
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c | 2 +-
.../msp71xx => pmcs-msp71xx}/msp_prom.c | 4 +-
.../msp71xx => pmcs-msp71xx}/msp_serial.c | 32 +-
.../msp71xx => pmcs-msp71xx}/msp_setup.c | 8 +-
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c | 0
.../msp71xx => pmcs-msp71xx}/msp_smtc.c | 0
.../msp71xx => pmcs-msp71xx}/msp_time.c | 2 +-
.../{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c | 54 +-
arch/mips/pnx833x/Platform | 2 +-
arch/mips/pnx833x/common/interrupts.c | 110 +-
arch/mips/pnx833x/common/platform.c | 34 +-
arch/mips/pnx833x/common/prom.c | 2 +-
arch/mips/pnx833x/common/reset.c | 2 +-
arch/mips/pnx833x/common/setup.c | 2 +-
arch/mips/pnx833x/stb22x/board.c | 2 +-
arch/mips/pnx8550/Makefile | 3 -
arch/mips/pnx8550/Platform | 7 -
arch/mips/pnx8550/common/Makefile | 26 -
arch/mips/pnx8550/common/int.c | 236 ----
arch/mips/pnx8550/common/pci.c | 134 ---
arch/mips/pnx8550/common/platform.c | 162 ---
arch/mips/pnx8550/common/proc.c | 110 --
arch/mips/pnx8550/common/prom.c | 128 ---
arch/mips/pnx8550/common/reset.c | 40 -
arch/mips/pnx8550/common/setup.c | 142 ---
arch/mips/pnx8550/common/time.c | 151 ---
arch/mips/pnx8550/jbs/Makefile | 4 -
arch/mips/pnx8550/jbs/board_setup.c | 56 -
arch/mips/pnx8550/jbs/init.c | 53 -
arch/mips/pnx8550/jbs/irqmap.c | 35 -
arch/mips/pnx8550/stb810/Makefile | 4 -
arch/mips/pnx8550/stb810/board_setup.c | 41 -
arch/mips/pnx8550/stb810/irqmap.c | 22 -
arch/mips/pnx8550/stb810/prom_init.c | 46 -
arch/mips/power/cpu.c | 2 +-
arch/mips/power/hibernate.S | 2 +-
arch/mips/powertv/asic/asic-calliope.c | 10 +-
arch/mips/powertv/asic/asic-cronus.c | 6 +-
arch/mips/powertv/asic/asic-gaia.c | 2 +-
arch/mips/powertv/asic/asic-zeus.c | 6 +-
arch/mips/powertv/asic/asic_devices.c | 8 +-
arch/mips/powertv/asic/asic_int.c | 4 +-
arch/mips/powertv/asic/irq_asic.c | 4 +-
arch/mips/powertv/asic/prealloc-calliope.c | 10 +-
arch/mips/powertv/asic/prealloc-cronus.c | 12 +-
arch/mips/powertv/asic/prealloc-cronuslite.c | 8 +-
arch/mips/powertv/asic/prealloc-gaia.c | 382 +++----
arch/mips/powertv/asic/prealloc-zeus.c | 10 +-
arch/mips/powertv/init.c | 2 +-
arch/mips/powertv/ioremap.c | 4 +-
arch/mips/powertv/memory.c | 2 +-
arch/mips/powertv/powertv-usb.c | 46 +-
arch/mips/ralink/Kconfig | 32 +
arch/mips/ralink/Makefile | 15 +
arch/mips/ralink/Platform | 10 +
arch/mips/ralink/clk.c | 72 ++
arch/mips/ralink/common.h | 44 +
arch/mips/ralink/dts/Makefile | 1 +
arch/mips/ralink/dts/rt3050.dtsi | 106 ++
arch/mips/ralink/dts/rt3052_eval.dts | 52 +
arch/mips/ralink/early_printk.c | 44 +
arch/mips/ralink/irq.c | 180 +++
arch/mips/ralink/of.c | 107 ++
arch/mips/ralink/prom.c | 69 ++
arch/mips/ralink/reset.c | 44 +
arch/mips/ralink/rt305x.c | 242 ++++
arch/mips/rb532/devices.c | 12 +-
arch/mips/rb532/gpio.c | 8 +-
arch/mips/rb532/irq.c | 4 +-
arch/mips/sgi-ip22/ip22-eisa.c | 14 +-
arch/mips/sgi-ip22/ip22-gio.c | 14 +-
arch/mips/sgi-ip22/ip22-int.c | 36 +-
arch/mips/sgi-ip22/ip22-mc.c | 44 +-
arch/mips/sgi-ip22/ip22-nvram.c | 16 +-
arch/mips/sgi-ip22/ip22-platform.c | 8 +-
arch/mips/sgi-ip22/ip22-reset.c | 4 +-
arch/mips/sgi-ip22/ip28-berr.c | 16 +-
arch/mips/sgi-ip27/ip27-berr.c | 4 +-
arch/mips/sgi-ip27/ip27-console.c | 2 +-
arch/mips/sgi-ip27/ip27-hubio.c | 14 +-
arch/mips/sgi-ip27/ip27-init.c | 2 +-
arch/mips/sgi-ip27/ip27-irq.c | 6 +-
arch/mips/sgi-ip27/ip27-memory.c | 12 +-
arch/mips/sgi-ip27/ip27-nmi.c | 6 +-
arch/mips/sgi-ip27/ip27-reset.c | 2 +-
arch/mips/sgi-ip27/ip27-smp.c | 4 +-
arch/mips/sgi-ip27/ip27-timer.c | 6 +-
arch/mips/sgi-ip27/ip27-xtalk.c | 16 +-
arch/mips/sgi-ip32/ip32-irq.c | 8 +-
arch/mips/sibyte/Platform | 6 +-
arch/mips/sibyte/bcm1480/irq.c | 8 +-
arch/mips/sibyte/common/cfe.c | 10 +-
arch/mips/sibyte/common/sb_tbprof.c | 18 +-
arch/mips/sibyte/sb1250/bus_watcher.c | 6 +-
arch/mips/sibyte/sb1250/irq.c | 8 +-
arch/mips/sibyte/sb1250/setup.c | 18 +-
arch/mips/sibyte/swarm/platform.c | 4 +-
arch/mips/sibyte/swarm/rtc_xicor1241.c | 50 +-
arch/mips/sni/a20r.c | 44 +-
arch/mips/sni/eisa.c | 2 +-
arch/mips/sni/irq.c | 20 +-
arch/mips/sni/pcimt.c | 36 +-
arch/mips/sni/pcit.c | 40 +-
arch/mips/sni/rm200.c | 38 +-
arch/mips/sni/setup.c | 24 +-
arch/mips/sni/time.c | 30 +-
arch/mips/txx9/Platform | 4 +-
arch/mips/txx9/generic/irq_tx4927.c | 2 +-
arch/mips/txx9/generic/irq_tx4939.c | 4 +-
arch/mips/txx9/generic/mem_tx4927.c | 2 +-
arch/mips/txx9/generic/pci.c | 4 +-
arch/mips/txx9/generic/setup.c | 8 +-
arch/mips/txx9/generic/setup_tx3927.c | 2 +-
arch/mips/txx9/generic/setup_tx4927.c | 2 +-
arch/mips/txx9/generic/setup_tx4938.c | 2 +-
arch/mips/txx9/generic/setup_tx4939.c | 4 +-
arch/mips/txx9/generic/smsc_fdc37m81x.c | 48 +-
arch/mips/txx9/rbtx4927/irq.c | 2 +-
arch/mips/txx9/rbtx4927/prom.c | 2 +-
arch/mips/txx9/rbtx4927/setup.c | 2 +-
arch/mips/txx9/rbtx4938/setup.c | 8 +-
arch/mips/txx9/rbtx4939/setup.c | 4 +-
arch/mips/vr41xx/common/bcu.c | 4 +-
arch/mips/vr41xx/common/cmu.c | 16 +-
arch/mips/vr41xx/common/giu.c | 2 +-
arch/mips/vr41xx/common/icu.c | 8 +-
arch/mips/vr41xx/common/pmu.c | 2 +-
arch/mips/vr41xx/common/rtc.c | 2 +-
arch/mips/vr41xx/common/type.c | 2 +-
arch/mips/wrppmc/Platform | 2 +-
arch/mips/wrppmc/irq.c | 4 +-
arch/mips/wrppmc/serial.c | 2 +-
drivers/mtd/bcm47xxpart.c | 2 +-
drivers/net/ethernet/broadcom/b44.c | 4 +-
drivers/net/ethernet/broadcom/bgmac.c | 6 +-
drivers/ssb/driver_chipcommon_pmu.c | 4 +-
drivers/tty/serial/Kconfig | 10 +-
883 files changed, 16129 insertions(+), 15920 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mips/cpu_irq.txt
create mode 100644 Documentation/devicetree/bindings/serial/lantiq_asc.txt
create mode 100644 arch/mips/ath79/mach-ap136.c
create mode 100644 arch/mips/cavium-octeon/oct_ilm.c
delete mode 100644 arch/mips/configs/pnx8550_jbs_defconfig
delete mode 100644 arch/mips/configs/pnx8550_stb810_defconfig
create mode 100644 arch/mips/configs/rt305x_defconfig
create mode 100644 arch/mips/include/asm/break.h
delete mode 100644 arch/mips/include/asm/mach-ath79/pci.h
rename arch/mips/include/asm/mach-bcm47xx/{nvram.h => bcm47xx_nvram.h} (84%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/cpu-feature-overrides.h (100%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/gpio.h (100%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_cic_int.h (61%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_gpio_macros.h (99%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_int.h (91%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_pci.h (87%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_prom.h (96%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regops.h (99%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_regs.h (65%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_slp_int.h (63%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/msp_usb.h (99%)
rename arch/mips/include/asm/{pmc-sierra/msp71xx => mach-pmcs-msp71xx}/war.h (91%)
delete mode 100644 arch/mips/include/asm/mach-pnx8550/cm.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/glb.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/int.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/kernel-entry-init.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/nand.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/pci.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/uart.h
delete mode 100644 arch/mips/include/asm/mach-pnx8550/usb.h
create mode 100644 arch/mips/include/asm/mach-ralink/ralink_regs.h
create mode 100644 arch/mips/include/asm/mach-ralink/rt305x.h
rename arch/mips/include/asm/{mach-pnx8550 => mach-ralink}/war.h (83%)
create mode 100644 arch/mips/include/uapi/asm/inst.h
create mode 100644 arch/mips/kernel/csrc-gic.c
delete mode 100644 arch/mips/mti-sead3/sead3-memory.c
create mode 100644 arch/mips/mti-sead3/sead3.dts
delete mode 100644 arch/mips/pci/fixup-pnx8550.c
delete mode 100644 arch/mips/pci/ops-pnx8550.c
delete mode 100644 arch/mips/pmc-sierra/Platform
rename arch/mips/{pmc-sierra => pmcs-msp71xx}/Kconfig (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/Makefile (100%)
create mode 100644 arch/mips/pmcs-msp71xx/Platform
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/gpio_extended.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_elb.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_eth.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_hwbutton.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq.c (97%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_cic.c (96%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_per.c (95%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_irq_slp.c (94%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_pci.c (97%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_prom.c (99%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_serial.c (87%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_setup.c (95%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smp.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_smtc.c (100%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_time.c (99%)
rename arch/mips/{pmc-sierra/msp71xx => pmcs-msp71xx}/msp_usb.c (87%)
delete mode 100644 arch/mips/pnx8550/Makefile
delete mode 100644 arch/mips/pnx8550/Platform
delete mode 100644 arch/mips/pnx8550/common/Makefile
delete mode 100644 arch/mips/pnx8550/common/int.c
delete mode 100644 arch/mips/pnx8550/common/pci.c
delete mode 100644 arch/mips/pnx8550/common/platform.c
delete mode 100644 arch/mips/pnx8550/common/proc.c
delete mode 100644 arch/mips/pnx8550/common/prom.c
delete mode 100644 arch/mips/pnx8550/common/reset.c
delete mode 100644 arch/mips/pnx8550/common/setup.c
delete mode 100644 arch/mips/pnx8550/common/time.c
delete mode 100644 arch/mips/pnx8550/jbs/Makefile
delete mode 100644 arch/mips/pnx8550/jbs/board_setup.c
delete mode 100644 arch/mips/pnx8550/jbs/init.c
delete mode 100644 arch/mips/pnx8550/jbs/irqmap.c
delete mode 100644 arch/mips/pnx8550/stb810/Makefile
delete mode 100644 arch/mips/pnx8550/stb810/board_setup.c
delete mode 100644 arch/mips/pnx8550/stb810/irqmap.c
delete mode 100644 arch/mips/pnx8550/stb810/prom_init.c
create mode 100644 arch/mips/ralink/Kconfig
create mode 100644 arch/mips/ralink/Makefile
create mode 100644 arch/mips/ralink/Platform
create mode 100644 arch/mips/ralink/clk.c
create mode 100644 arch/mips/ralink/common.h
create mode 100644 arch/mips/ralink/dts/Makefile
create mode 100644 arch/mips/ralink/dts/rt3050.dtsi
create mode 100644 arch/mips/ralink/dts/rt3052_eval.dts
create mode 100644 arch/mips/ralink/early_printk.c
create mode 100644 arch/mips/ralink/irq.c
create mode 100644 arch/mips/ralink/of.c
create mode 100644 arch/mips/ralink/prom.c
create mode 100644 arch/mips/ralink/reset.c
create mode 100644 arch/mips/ralink/rt305x.c
Merging openrisc/for-upstream (545ebd0 openrisc: require gpiolib)
$ git merge openrisc/for-upstream
Merge made by the 'recursive' strategy.
arch/openrisc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve())
$ git merge parisc/for-next
Already up-to-date.
Merging powerpc/next (8520e44 powerpc/kexec: Disable hard IRQ before kexec)
$ git merge powerpc/next
Already up-to-date.
Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
$ git merge 4xx/next
Already up-to-date.
Merging mpc5xxx/next (fa59f17 powerpc/5200: Use the gpt* labels to simplify mpc5200 dts files)
$ git merge mpc5xxx/next
Already up-to-date.
Merging galak/next (12c7e8f powerpc/85xx: l2sram - Add compatible string for BSC9131 platform)
$ git merge galak/next
Already up-to-date.
Merging s390/features (72a6b43 s390/module: fix compile warning)
$ git merge s390/features
Merge made by the 'recursive' strategy.
arch/s390/include/asm/futex.h | 6 --
arch/s390/include/asm/pgtable.h | 2 +
arch/s390/include/asm/uaccess.h | 23 ++-----
arch/s390/kernel/compat_signal.c | 14 -----
arch/s390/kernel/dis.c | 4 +-
arch/s390/kernel/module.c | 2 +-
arch/s390/kernel/signal.c | 8 ---
arch/s390/lib/uaccess_mvcos.c | 26 ++++----
arch/s390/lib/uaccess_pt.c | 129 ++++++++++++++++++++++++++++-----------
arch/s390/lib/uaccess_std.c | 48 ++++++---------
arch/s390/mm/dump_pagetables.c | 25 ++++++--
arch/s390/mm/vmem.c | 3 +-
drivers/input/serio/Kconfig | 2 +-
drivers/s390/block/dasd_eckd.c | 10 ++-
drivers/s390/cio/qdio_debug.c | 9 +--
drivers/s390/cio/qdio_debug.h | 3 +-
drivers/s390/cio/qdio_main.c | 2 +-
17 files changed, 172 insertions(+), 144 deletions(-)
Merging sh/sh-latest (035688d sh: ecovec: add sample amixer settings)
$ git merge sh/sh-latest
Already up-to-date.
Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive())
$ git merge tile/master
Auto-merging arch/tile/kernel/intvec_64.S
Auto-merging arch/tile/include/asm/syscalls.h
Auto-merging arch/tile/Kconfig
Merge made by the 'recursive' strategy.
arch/tile/Kconfig | 3 +++
arch/tile/include/asm/atomic.h | 21 ++++++++++++++++++++
arch/tile/include/asm/ptrace.h | 3 ++-
arch/tile/include/asm/syscall.h | 6 ++++++
arch/tile/include/asm/syscalls.h | 6 ------
arch/tile/include/asm/thread_info.h | 8 ++++++++
arch/tile/include/uapi/asm/unistd.h | 2 ++
arch/tile/kernel/intvec_32.S | 10 ++++++++--
arch/tile/kernel/intvec_64.S | 24 +++++++++++++++++------
arch/tile/kernel/ptrace.c | 39 +++++++++++++++++++------------------
10 files changed, 88 insertions(+), 34 deletions(-)
Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (9cf81c7 xtensa: add accept4 syscall)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (dc81cdc Btrfs: fix remount vs autodefrag)
$ git merge btrfs/next
Resolved 'fs/btrfs/extent-tree.c' using previous resolution.
Auto-merging include/uapi/linux/btrfs.h
Auto-merging fs/btrfs/transaction.c
Auto-merging fs/btrfs/send.c
Auto-merging fs/btrfs/relocation.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/btrfs/extent-tree.c
CONFLICT (content): Merge conflict in fs/btrfs/extent-tree.c
Auto-merging fs/btrfs/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7825dee] Merge remote-tracking branch 'btrfs/next'
$ git diff -M --stat --summary HEAD^..
fs/btrfs/Kconfig | 3 +
fs/btrfs/Makefile | 2 +-
fs/btrfs/backref.h | 2 +-
fs/btrfs/btrfs_inode.h | 20 +
fs/btrfs/check-integrity.c | 3 +-
fs/btrfs/compression.c | 4 +-
fs/btrfs/ctree.c | 68 +-
fs/btrfs/ctree.h | 141 +-
fs/btrfs/delayed-inode.c | 147 +-
fs/btrfs/delayed-inode.h | 1 +
fs/btrfs/delayed-ref.c | 82 +-
fs/btrfs/delayed-ref.h | 52 +-
fs/btrfs/dev-replace.c | 6 +-
fs/btrfs/disk-io.c | 222 ++-
fs/btrfs/disk-io.h | 7 +
fs/btrfs/extent-tree.c | 442 +++--
fs/btrfs/extent_io.c | 108 +-
fs/btrfs/extent_io.h | 5 +-
fs/btrfs/file-item.c | 67 +-
fs/btrfs/file.c | 54 +-
fs/btrfs/free-space-cache.c | 62 +-
fs/btrfs/inode.c | 998 ++++++++++--
fs/btrfs/ioctl.c | 120 +-
fs/btrfs/locking.c | 5 +-
fs/btrfs/ordered-data.c | 98 +-
fs/btrfs/ordered-data.h | 14 +-
fs/btrfs/print-tree.c | 1 +
fs/btrfs/qgroup.c | 6 +-
fs/btrfs/raid56.c | 2080 ++++++++++++++++++++++++
fs/btrfs/raid56.h | 51 +
fs/btrfs/relocation.c | 2 +-
fs/btrfs/scrub.c | 10 +-
fs/btrfs/send.c | 53 +-
fs/btrfs/send.h | 1 +
fs/btrfs/super.c | 89 +-
fs/btrfs/transaction.c | 132 +-
fs/btrfs/transaction.h | 6 +-
fs/btrfs/tree-defrag.c | 19 +-
fs/btrfs/tree-log.c | 139 +-
fs/btrfs/volumes.c | 634 ++++++--
fs/btrfs/volumes.h | 11 +-
include/linux/btrfs.h | 6 +
include/uapi/linux/Kbuild | 1 +
fs/btrfs/ioctl.h => include/uapi/linux/btrfs.h | 18 +-
44 files changed, 5171 insertions(+), 821 deletions(-)
create mode 100644 fs/btrfs/raid56.c
create mode 100644 fs/btrfs/raid56.h
create mode 100644 include/linux/btrfs.h
rename fs/btrfs/ioctl.h => include/uapi/linux/btrfs.h (96%)
Merging ceph/master (83ca14f libceph: add support for HASHPSPOOL pool flag)
$ git merge ceph/master
Auto-merging net/ceph/ceph_common.c
Auto-merging fs/ceph/super.h
Auto-merging fs/ceph/mds_client.h
Auto-merging fs/ceph/mds_client.c
Auto-merging fs/ceph/ioctl.c
Auto-merging fs/ceph/file.c
Auto-merging fs/ceph/caps.c
Auto-merging fs/ceph/addr.c
Merge made by the 'recursive' strategy.
drivers/block/rbd.c | 1852 ++++++++++++++++++++++--------------
fs/ceph/addr.c | 38 +-
fs/ceph/caps.c | 32 +-
fs/ceph/file.c | 8 +-
fs/ceph/ioctl.c | 6 +-
fs/ceph/mds_client.c | 33 +-
fs/ceph/mds_client.h | 6 +
fs/ceph/mdsmap.c | 12 +-
fs/ceph/strings.c | 4 +
fs/ceph/super.c | 7 +-
fs/ceph/super.h | 10 +-
fs/ceph/xattr.c | 214 ++++-
include/linux/ceph/ceph_features.h | 38 +-
include/linux/ceph/ceph_fs.h | 32 +-
include/linux/ceph/decode.h | 29 +-
include/linux/ceph/libceph.h | 16 +-
include/linux/ceph/mdsmap.h | 4 +-
include/linux/ceph/messenger.h | 2 +
include/linux/ceph/osd_client.h | 74 +-
include/linux/ceph/osdmap.h | 30 +-
include/linux/ceph/rados.h | 158 ++-
include/linux/crush/crush.h | 2 +
net/ceph/ceph_common.c | 22 +-
net/ceph/ceph_strings.c | 39 +
net/ceph/crush/mapper.c | 15 +-
net/ceph/crypto.c | 7 +-
net/ceph/debugfs.c | 29 +-
net/ceph/messenger.c | 260 +++--
net/ceph/mon_client.c | 2 +-
net/ceph/osd_client.c | 635 +++++++------
net/ceph/osdmap.c | 290 +++---
net/ceph/pagevec.c | 24 +-
32 files changed, 2402 insertions(+), 1528 deletions(-)
Merging cifs/for-next (c51bb0e cifs: bugfix for unreclaimed writeback pages in cifs_writev_requeue())
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/cifsfs.c | 5 +++++
fs/cifs/cifssmb.c | 5 ++++-
fs/cifs/connect.c | 2 +-
fs/cifs/file.c | 12 +++++++++---
4 files changed, 19 insertions(+), 5 deletions(-)
Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
$ git merge configfs/linux-next
Already up-to-date.
Merging ecryptfs/next (1111eae eCryptfs: Fix redundant error check on ecryptfs_find_daemon_by_euid())
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/messaging.c
Auto-merging fs/ecryptfs/inode.c
Auto-merging fs/ecryptfs/file.c
Merge made by the 'recursive' strategy.
fs/ecryptfs/crypto.c | 9 +++------
fs/ecryptfs/dentry.c | 2 --
fs/ecryptfs/file.c | 2 --
fs/ecryptfs/inode.c | 8 ++++----
fs/ecryptfs/keystore.c | 5 ++---
fs/ecryptfs/messaging.c | 5 ++---
6 files changed, 11 insertions(+), 20 deletions(-)
Merging ext3/for_next (712ddc5 Ext2: remove the static function release_blocks to optimize the kernel)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (8e919d1 ext4: fix extent status tree regression for file systems > 512GB)
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (7dd690c f2fs: avoid build warning)
$ git merge f2fs/dev
Already up-to-date.
Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/master (fd95e81 GFS2: Reinstate withdraw ack system)
$ git merge gfs2/master
Already up-to-date.
Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits)
$ git merge jfs/jfs-next
Merge made by the 'recursive' strategy.
fs/jfs/jfs_imap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found)
$ git merge logfs/master
Merge made by the 'recursive' strategy.
fs/logfs/dev_mtd.c | 2 +-
fs/logfs/super.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
Merging nfs/linux-next (f6488c9 nfs: don't allow nfs_find_actor to match inodes of the wrong type)
$ git merge nfs/linux-next
Auto-merging fs/nfs/inode.c
Merge made by the 'recursive' strategy.
fs/nfs/inode.c | 2 ++
fs/nfs/nfs4filelayout.c | 6 ++++--
fs/nfs/nfs4proc.c | 11 +++++++++--
fs/nfs/pnfs.c | 14 ++++++++++----
fs/nfs/pnfs.h | 6 ++++--
fs/nfs/unlink.c | 20 +++++++++++++-------
net/sunrpc/xprt.c | 6 +++++-
7 files changed, 47 insertions(+), 18 deletions(-)
Merging nfsd/nfsd-next (dc10740 SUNRPC: make AF_LOCAL connect synchronous)
$ git merge nfsd/nfsd-next
Recorded preimage for 'fs/nfsd/nfscache.c'
Resolved 'net/sunrpc/svcauth_unix.c' using previous resolution.
Auto-merging net/sunrpc/xprtsock.c
Auto-merging net/sunrpc/xprtrdma/transport.c
Auto-merging net/sunrpc/svcauth_unix.c
CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c
Auto-merging net/sunrpc/clnt.c
Auto-merging net/sunrpc/cache.c
Auto-merging net/sunrpc/auth_gss/svcauth_gss.c
Auto-merging include/linux/lockd/lockd.h
Auto-merging fs/nfsd/nfssvc.c
Auto-merging fs/nfsd/nfsctl.c
Auto-merging fs/nfsd/nfscache.c
CONFLICT (content): Merge conflict in fs/nfsd/nfscache.c
Auto-merging fs/nfsd/nfs4xdr.c
Auto-merging fs/nfsd/nfs4state.c
Auto-merging fs/nfsd/nfs4recover.c
Auto-merging fs/nfsd/nfs4idmap.c
Auto-merging fs/nfsd/fault_inject.c
Auto-merging fs/nfsd/export.c
Auto-merging fs/nfs/super.c
Auto-merging fs/nfs/nfs4client.c
Auto-merging fs/lockd/svcsubs.c
Auto-merging fs/lockd/host.c
Auto-merging fs/lockd/clntproc.c
Auto-merging fs/lockd/clntlock.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'fs/nfsd/nfscache.c'.
[master 5c9ebe3] Merge remote-tracking branch 'nfsd/nfsd-next'
$ git diff -M --stat --summary HEAD^..
fs/lockd/clntlock.c | 14 +-
fs/lockd/clntproc.c | 6 +-
fs/lockd/host.c | 1 +
fs/lockd/mon.c | 1 +
fs/lockd/svcsubs.c | 2 +-
fs/nfs/cache_lib.c | 12 +-
fs/nfs/cache_lib.h | 2 -
fs/nfs/dns_resolve.c | 67 +++----
fs/nfs/nfs4client.c | 1 +
fs/nfs/nfs4filelayoutdev.c | 1 +
fs/nfs/nfs4namespace.c | 1 +
fs/nfs/super.c | 1 +
fs/nfsd/cache.h | 17 +-
fs/nfsd/export.c | 16 +-
fs/nfsd/fault_inject.c | 2 +-
fs/nfsd/nfs4idmap.c | 16 +-
fs/nfsd/nfs4proc.c | 7 +-
fs/nfsd/nfs4recover.c | 6 +
fs/nfsd/nfs4state.c | 102 ++++++-----
fs/nfsd/nfs4xdr.c | 21 +--
fs/nfsd/nfscache.c | 352 ++++++++++++++++++++++++++++--------
fs/nfsd/nfsctl.c | 81 ++++++---
fs/nfsd/nfssvc.c | 6 +-
fs/nfsd/xdr4.h | 2 +-
include/linux/lockd/lockd.h | 3 +-
include/linux/sunrpc/addr.h | 170 +++++++++++++++++
include/linux/sunrpc/cache.h | 10 +-
include/linux/sunrpc/clnt.h | 152 ----------------
include/linux/sunrpc/svc.h | 1 +
include/linux/sunrpc/xdr.h | 3 +-
net/sunrpc/addr.c | 3 +-
net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +
net/sunrpc/auth_gss/svcauth_gss.c | 18 +-
net/sunrpc/cache.c | 51 +++---
net/sunrpc/clnt.c | 1 +
net/sunrpc/rpcb_clnt.c | 1 +
net/sunrpc/svc.c | 13 +-
net/sunrpc/svc_xprt.c | 81 +++++----
net/sunrpc/svcauth_unix.c | 16 +-
net/sunrpc/xdr.c | 41 +++++
net/sunrpc/xprtrdma/transport.c | 1 +
net/sunrpc/xprtsock.c | 36 +++-
42 files changed, 833 insertions(+), 507 deletions(-)
create mode 100644 include/linux/sunrpc/addr.h
$ git reset --hard HEAD^
HEAD is now at 48e2e50 Merge remote-tracking branch 'nfs/linux-next'
Merging 20130228 version of nfsd
$ git merge -m 20130228/nfsd 56edc86b5a72bdbc86358e57fb09165136baf0b8
Resolved 'fs/nfsd/nfscache.c' using previous resolution.
Resolved 'net/sunrpc/svcauth_unix.c' using previous resolution.
Auto-merging net/sunrpc/xprtsock.c
Auto-merging net/sunrpc/xprtrdma/transport.c
Auto-merging net/sunrpc/svcauth_unix.c
CONFLICT (content): Merge conflict in net/sunrpc/svcauth_unix.c
Auto-merging net/sunrpc/clnt.c
Auto-merging net/sunrpc/cache.c
Auto-merging net/sunrpc/auth_gss/svcauth_gss.c
Auto-merging include/linux/lockd/lockd.h
Auto-merging fs/nfsd/nfssvc.c
Auto-merging fs/nfsd/nfsctl.c
Auto-merging fs/nfsd/nfscache.c
CONFLICT (content): Merge conflict in fs/nfsd/nfscache.c
Auto-merging fs/nfsd/nfs4xdr.c
Auto-merging fs/nfsd/nfs4state.c
Auto-merging fs/nfsd/nfs4recover.c
Auto-merging fs/nfsd/nfs4idmap.c
Auto-merging fs/nfsd/fault_inject.c
Auto-merging fs/nfsd/export.c
Auto-merging fs/nfs/super.c
Auto-merging fs/nfs/nfs4client.c
Auto-merging fs/lockd/svcsubs.c
Auto-merging fs/lockd/host.c
Auto-merging fs/lockd/clntproc.c
Auto-merging fs/lockd/clntlock.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a879319] 20130228/nfsd
$ git diff -M --stat --summary HEAD^..
fs/lockd/clntlock.c | 14 +-
fs/lockd/clntproc.c | 6 +-
fs/lockd/host.c | 1 +
fs/lockd/mon.c | 1 +
fs/lockd/svcsubs.c | 2 +-
fs/nfs/cache_lib.c | 12 +-
fs/nfs/cache_lib.h | 2 -
fs/nfs/dns_resolve.c | 67 +++----
fs/nfs/nfs4client.c | 1 +
fs/nfs/nfs4filelayoutdev.c | 1 +
fs/nfs/nfs4namespace.c | 1 +
fs/nfs/super.c | 1 +
fs/nfsd/cache.h | 17 +-
fs/nfsd/export.c | 16 +-
fs/nfsd/fault_inject.c | 2 +-
fs/nfsd/nfs4idmap.c | 16 +-
fs/nfsd/nfs4proc.c | 7 +-
fs/nfsd/nfs4recover.c | 6 +
fs/nfsd/nfs4state.c | 102 ++++++-----
fs/nfsd/nfs4xdr.c | 21 +--
fs/nfsd/nfscache.c | 352 ++++++++++++++++++++++++++++--------
fs/nfsd/nfsctl.c | 81 ++++++---
fs/nfsd/nfssvc.c | 6 +-
fs/nfsd/xdr4.h | 2 +-
include/linux/lockd/lockd.h | 3 +-
include/linux/sunrpc/addr.h | 170 +++++++++++++++++
include/linux/sunrpc/cache.h | 10 +-
include/linux/sunrpc/clnt.h | 152 ----------------
include/linux/sunrpc/svc.h | 1 +
include/linux/sunrpc/xdr.h | 3 +-
net/sunrpc/addr.c | 3 +-
net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +
net/sunrpc/auth_gss/svcauth_gss.c | 18 +-
net/sunrpc/cache.c | 51 +++---
net/sunrpc/clnt.c | 1 +
net/sunrpc/rpcb_clnt.c | 1 +
net/sunrpc/svc.c | 13 +-
net/sunrpc/svc_xprt.c | 81 +++++----
net/sunrpc/svcauth_unix.c | 16 +-
net/sunrpc/xdr.c | 41 +++++
net/sunrpc/xprtrdma/transport.c | 1 +
net/sunrpc/xprtsock.c | 1 +
42 files changed, 806 insertions(+), 499 deletions(-)
create mode 100644 include/linux/sunrpc/addr.h
Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
$ git merge ocfs2/linux-next
Auto-merging fs/ocfs2/dlm/dlmrecovery.c
Auto-merging fs/ocfs2/dlm/dlmmaster.c
Auto-merging fs/ocfs2/cluster/heartbeat.c
Merge made by the 'recursive' strategy.
fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
fs/ocfs2/cluster/masklog.h | 3 ++-
fs/ocfs2/dlm/dlmmaster.c | 8 +++++++-
fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
4 files changed, 25 insertions(+), 33 deletions(-)
Merging omfs/for-next (976d167 Linux 3.1-rc9)
$ git merge omfs/for-next
Already up-to-date.
Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (8afd500 UBIFS: fix double free of ubifs_orphan objects)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (1e82379 xfs: xfs_bmap_add_attrfork_local is too generic)
$ git merge xfs/for-next
Already up-to-date.
Merging vfs/for-next (d3d009c saner proc_get_inode() calling conventions)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (018ba0a Merge branch 'pci/yinghai-root-bus-hotplug' into next)
$ git merge pci/next
Already up-to-date.
Merging hid/for-next (e3dc8bf Merge branch 'for-3.9/logitech' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
Merging i2c/i2c/for-next (55827f4 i2c: Remove unneeded xxx_set_drvdata(..., NULL) calls)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (2a7d2b9 Merge branch 'akpm' (final batch from Andrew))
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (796450c hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
Documentation/hwmon/adm1275 | 2 +-
Documentation/hwmon/jc42 | 2 +-
Documentation/hwmon/lineage-pem | 2 +-
Documentation/hwmon/lm25066 | 2 +-
Documentation/hwmon/ltc2978 | 6 +++---
Documentation/hwmon/ltc4261 | 2 +-
Documentation/hwmon/max16064 | 2 +-
Documentation/hwmon/max16065 | 2 +-
Documentation/hwmon/max34440 | 2 +-
Documentation/hwmon/max8688 | 2 +-
Documentation/hwmon/pmbus | 2 +-
Documentation/hwmon/smm665 | 2 +-
Documentation/hwmon/ucd9000 | 2 +-
Documentation/hwmon/ucd9200 | 2 +-
Documentation/hwmon/zl6100 | 2 +-
drivers/hwmon/pmbus/ltc2978.c | 30 ++++++++++++++++--------------
16 files changed, 33 insertions(+), 31 deletions(-)
Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork)
$ git merge v4l-dvb/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging kbuild/for-next (26901f2 Merge branches 'kbuild/kbuild' and 'kbuild/kconfig' into kbuild/for-next)
$ git merge kbuild/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/NEXT (53637e0 [libata] fix smatch warning for zpodd_wake_dev)
$ git merge libata/NEXT
Already up-to-date.
Merging infiniband/for-next (ef4e359 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change)
$ git merge pstore/master
Already up-to-date.
Merging pm/linux-next (4383822 Merge branch 'acpi-pm' into fixes)
$ git merge pm/linux-next
Already up-to-date.
Merging idle/next (ca62cf5 Merge branch 'misc' into release)
$ git merge idle/next
Already up-to-date.
Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
$ git merge apm/for-next
Already up-to-date.
Merging cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2)
$ git merge cpuidle/cpuidle-next
Already up-to-date.
Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
$ git merge cpupowerutils/master
Already up-to-date.
Merging thermal/next (f5b6d45 thermal: rcar: remove __devinitconst)
$ git merge thermal/next
Resolved 'drivers/thermal/exynos_thermal.c' using previous resolution.
Auto-merging kernel/time/tick-sched.c
Auto-merging drivers/thermal/thermal_sys.c
Auto-merging drivers/thermal/exynos_thermal.c
CONFLICT (content): Merge conflict in drivers/thermal/exynos_thermal.c
Auto-merging drivers/thermal/cpu_cooling.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d793c22] Merge remote-tracking branch 'thermal/next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/thermal/dove-thermal.txt | 18 +
.../bindings/thermal/kirkwood-thermal.txt | 15 +
.../devicetree/bindings/thermal/rcar-thermal.txt | 29 +
Documentation/thermal/exynos_thermal_emulation | 53 ++
Documentation/thermal/intel_powerclamp.txt | 307 ++++++++
Documentation/thermal/sysfs-api.txt | 18 +-
arch/x86/kernel/nmi.c | 1 +
drivers/thermal/Kconfig | 55 +-
drivers/thermal/Makefile | 10 +-
drivers/thermal/cpu_cooling.c | 4 +-
drivers/thermal/db8500_cpufreq_cooling.c | 5 +-
drivers/thermal/db8500_thermal.c | 4 +-
drivers/thermal/dove_thermal.c | 209 ++++++
drivers/thermal/exynos_thermal.c | 211 ++++--
drivers/thermal/intel_powerclamp.c | 794 +++++++++++++++++++++
drivers/thermal/kirkwood_thermal.c | 134 ++++
drivers/thermal/rcar_thermal.c | 490 +++++++++----
drivers/thermal/spear_thermal.c | 7 +-
drivers/thermal/step_wise.c | 122 ++--
drivers/thermal/thermal_sys.c | 105 ++-
include/linux/platform_data/exynos_thermal.h | 3 +
include/linux/thermal.h | 10 +-
kernel/time/tick-sched.c | 2 +
23 files changed, 2337 insertions(+), 269 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/dove-thermal.txt
create mode 100644 Documentation/devicetree/bindings/thermal/kirkwood-thermal.txt
create mode 100644 Documentation/devicetree/bindings/thermal/rcar-thermal.txt
create mode 100644 Documentation/thermal/exynos_thermal_emulation
create mode 100644 Documentation/thermal/intel_powerclamp.txt
create mode 100644 drivers/thermal/dove_thermal.c
create mode 100644 drivers/thermal/intel_powerclamp.c
create mode 100644 drivers/thermal/kirkwood_thermal.c
$ git am -3 ../patches/0001-sched-rt-fix-PowerClamp-Driver-for-define-move.patch
Applying: sched/rt: fix PowerClamp Driver for define move
$ git reset HEAD^
Unstaged changes after reset:
M drivers/thermal/intel_powerclamp.c
$ git add -A .
$ git commit -v -a --amend
[master d72e83a] Merge remote-tracking branch 'thermal/next'
Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast())
$ git merge ieee1394/for-next
Already up-to-date.
Merging ubi/linux-next (19f949f Linux 3.8)
$ git merge ubi/linux-next
Already up-to-date.
Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging scsi/for-next (319cc77 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Auto-merging drivers/scsi/storvsc_drv.c
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-fcoe | 45 +-
Documentation/scsi/ChangeLog.megaraid_sas | 9 +
drivers/scsi/aacraid/src.c | 4 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 256 +++++-----
drivers/scsi/dc395x.c | 2 +-
drivers/scsi/fcoe/fcoe.c | 266 ++++++----
drivers/scsi/fcoe/fcoe.h | 6 +-
drivers/scsi/fcoe/fcoe_ctlr.c | 45 +-
drivers/scsi/fcoe/fcoe_sysfs.c | 186 +++++--
drivers/scsi/fcoe/fcoe_transport.c | 199 +++++++-
drivers/scsi/fcoe/libfcoe.h | 20 +-
drivers/scsi/fnic/Makefile | 2 +
drivers/scsi/fnic/fnic.h | 60 +++
drivers/scsi/fnic/fnic_debugfs.c | 314 ++++++++++++
drivers/scsi/fnic/fnic_io.h | 6 +-
drivers/scsi/fnic/fnic_main.c | 17 +
drivers/scsi/fnic/fnic_scsi.c | 721 ++++++++++++++++++++++++++--
drivers/scsi/fnic/fnic_trace.c | 273 +++++++++++
drivers/scsi/fnic/fnic_trace.h | 90 ++++
drivers/scsi/hpsa.c | 117 +++--
drivers/scsi/ipr.c | 33 +-
drivers/scsi/ipr.h | 1 +
drivers/scsi/libfc/fc_fcp.c | 6 +-
drivers/scsi/libfc/fc_libfc.h | 38 +-
drivers/scsi/libfc/fc_rport.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 56 +--
drivers/scsi/megaraid/megaraid_sas.h | 6 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +-
drivers/scsi/megaraid/megaraid_sas_fusion.h | 1 -
drivers/scsi/mpt2sas/mpt2sas_base.c | 8 +
drivers/scsi/mpt2sas/mpt2sas_base.h | 6 +
drivers/scsi/mvsas/mv_sas.c | 10 +-
drivers/scsi/mvsas/mv_sas.h | 1 +
drivers/scsi/osd/osd_initiator.c | 4 +
drivers/scsi/pm8001/pm8001_init.c | 3 +-
drivers/scsi/qla2xxx/qla_attr.c | 35 +-
drivers/scsi/qla2xxx/qla_bsg.c | 199 +++++---
drivers/scsi/qla2xxx/qla_bsg.h | 2 +-
drivers/scsi/qla2xxx/qla_dbg.c | 17 +-
drivers/scsi/qla2xxx/qla_dbg.h | 2 +-
drivers/scsi/qla2xxx/qla_def.h | 54 ++-
drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
drivers/scsi/qla2xxx/qla_fw.h | 7 +-
drivers/scsi/qla2xxx/qla_gbl.h | 15 +-
drivers/scsi/qla2xxx/qla_gs.c | 10 +-
drivers/scsi/qla2xxx/qla_init.c | 200 ++++++--
drivers/scsi/qla2xxx/qla_inline.h | 28 +-
drivers/scsi/qla2xxx/qla_iocb.c | 39 +-
drivers/scsi/qla2xxx/qla_isr.c | 82 +++-
drivers/scsi/qla2xxx/qla_mbx.c | 207 ++++++--
drivers/scsi/qla2xxx/qla_mid.c | 9 +-
drivers/scsi/qla2xxx/qla_nx.c | 13 +-
drivers/scsi/qla2xxx/qla_nx.h | 4 +-
drivers/scsi/qla2xxx/qla_os.c | 147 +++++-
drivers/scsi/qla2xxx/qla_settings.h | 2 +-
drivers/scsi/qla2xxx/qla_sup.c | 18 +-
drivers/scsi/qla2xxx/qla_target.c | 169 ++++++-
drivers/scsi/qla2xxx/qla_target.h | 19 +-
drivers/scsi/qla2xxx/qla_version.h | 2 +-
drivers/scsi/qla4xxx/ql4_mbx.c | 6 +-
drivers/scsi/storvsc_drv.c | 137 ++++--
include/scsi/Kbuild | 3 -
include/scsi/fc/Kbuild | 4 -
include/scsi/fcoe_sysfs.h | 11 +-
include/scsi/libfcoe.h | 32 +-
include/scsi/scsi_host.h | 4 +-
include/uapi/scsi/Kbuild | 3 +
include/uapi/scsi/fc/Kbuild | 4 +
include/{ => uapi}/scsi/fc/fc_els.h | 0
include/{ => uapi}/scsi/fc/fc_fs.h | 0
include/{ => uapi}/scsi/fc/fc_gs.h | 0
include/{ => uapi}/scsi/fc/fc_ns.h | 0
include/{ => uapi}/scsi/scsi_bsg_fc.h | 0
include/{ => uapi}/scsi/scsi_netlink.h | 0
include/{ => uapi}/scsi/scsi_netlink_fc.h | 0
76 files changed, 3520 insertions(+), 786 deletions(-)
create mode 100644 drivers/scsi/fnic/fnic_debugfs.c
create mode 100644 drivers/scsi/fnic/fnic_trace.c
create mode 100644 drivers/scsi/fnic/fnic_trace.h
rename include/{ => uapi}/scsi/fc/fc_els.h (100%)
rename include/{ => uapi}/scsi/fc/fc_fs.h (100%)
rename include/{ => uapi}/scsi/fc/fc_gs.h (100%)
rename include/{ => uapi}/scsi/fc/fc_ns.h (100%)
rename include/{ => uapi}/scsi/scsi_bsg_fc.h (100%)
rename include/{ => uapi}/scsi/scsi_netlink.h (100%)
rename include/{ => uapi}/scsi/scsi_netlink_fc.h (100%)
Merging target-updates/for-next (2dbe10a target/pscsi: Rename sg_num to nr_vecs in pscsi_get_bio())
$ git merge target-updates/for-next
Auto-merging drivers/target/target_core_file.c
Auto-merging drivers/target/sbp/sbp_target.c
Auto-merging drivers/target/iscsi/iscsi_target.c
Merge made by the 'recursive' strategy.
drivers/target/iscsi/iscsi_target.c | 11 +++++++++--
drivers/target/sbp/sbp_target.c | 2 +-
drivers/target/target_core_file.c | 2 +-
drivers/target/target_core_iblock.c | 2 +-
drivers/target/target_core_pscsi.c | 9 +++------
5 files changed, 15 insertions(+), 11 deletions(-)
Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
$ git merge ibft/linux-next
Already up-to-date.
Merging isci/all (6734092 isci: add a couple __iomem annotations)
$ git merge isci/all
Already up-to-date.
Merging slave-dma/next (f9c6a65 dmaengine: dw_dmac: move to generic DMA binding)
$ git merge slave-dma/next
Auto-merging drivers/dma/dw_dmac.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/dma/snps-dma.txt | 70 +++++-----
drivers/dma/dw_dmac.c | 145 ++++++++++-----------
drivers/dma/dw_dmac_regs.h | 7 +-
include/linux/dmaengine.h | 16 +++
include/linux/dw_dmac.h | 5 -
5 files changed, 127 insertions(+), 116 deletions(-)
Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock)
$ git merge dmaengine/next
Resolved 'drivers/dma/ioat/dma_v3.c' using previous resolution.
Auto-merging drivers/dma/ioat/dma_v3.c
CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f964b48] Merge remote-tracking branch 'dmaengine/next'
$ git diff -M --stat --summary HEAD^..
Merging net-next/master (1cef935 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net-next/master
Already up-to-date.
Merging ipsec-next/master (a0b1c42 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next)
$ git merge ipsec-next/master
Already up-to-date.
Merging wireless-next/master (b53cf45 net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmalloc() fails.)
$ git merge wireless-next/master
Already up-to-date.
Merging bluetooth/master (0d4b884 Bluetooth: Remove redundant RFCOMM BT_CLOSED settings)
$ git merge bluetooth/master
Recorded preimage for 'net/bluetooth/rfcomm/core.c'
Auto-merging net/bluetooth/sco.c
Auto-merging net/bluetooth/rfcomm/sock.c
Auto-merging net/bluetooth/rfcomm/core.c
CONFLICT (content): Merge conflict in net/bluetooth/rfcomm/core.c
Auto-merging net/bluetooth/hci_sock.c
Auto-merging net/bluetooth/hci_core.c
Auto-merging net/bluetooth/af_bluetooth.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'net/bluetooth/rfcomm/core.c'.
[master a88b32c] Merge remote-tracking branch 'bluetooth/master'
$ git diff -M --stat --summary HEAD^..
include/net/bluetooth/bluetooth.h | 2 +-
include/net/bluetooth/hci_core.h | 2 +-
include/net/bluetooth/rfcomm.h | 6 --
net/bluetooth/af_bluetooth.c | 15 +---
net/bluetooth/bnep/sock.c | 4 +-
net/bluetooth/cmtp/sock.c | 4 +-
net/bluetooth/hci_conn.c | 4 +-
net/bluetooth/hci_core.c | 2 +-
net/bluetooth/hci_event.c | 4 +-
net/bluetooth/hci_sock.c | 4 +-
net/bluetooth/hidp/core.c | 4 +
net/bluetooth/hidp/sock.c | 4 +-
net/bluetooth/l2cap_sock.c | 4 +-
net/bluetooth/rfcomm/core.c | 163 ++++++++++++++++++--------------------
net/bluetooth/rfcomm/sock.c | 3 +-
net/bluetooth/sco.c | 3 +-
16 files changed, 97 insertions(+), 131 deletions(-)
Merging mtd/master (0ce82b7 mtd: nand: onfi don't WARN if we are in 16 bits mode)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (24dea0c mtd: map: BUG() in non handled cases)
$ git merge l2-mtd/master
Auto-merging include/linux/bcma/bcma_driver_chipcommon.h
Auto-merging drivers/mtd/tests/mtd_stresstest.c
Auto-merging drivers/mtd/tests/mtd_nandecctest.c
Auto-merging drivers/mtd/nand/omap2.c
Auto-merging drivers/mtd/nand/nandsim.c
Auto-merging drivers/mtd/nand/nand_base.c
Auto-merging drivers/mtd/nand/mxc_nand.c
Auto-merging drivers/mtd/nand/davinci_nand.c
Auto-merging drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c
Auto-merging drivers/mtd/maps/physmap_of.c
Auto-merging drivers/mtd/bcm47xxpart.c
Auto-merging drivers/mtd/Kconfig
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mtd/elm.txt | 16 +
.../devicetree/bindings/mtd/mtd-physmap.txt | 3 +
drivers/mtd/Kconfig | 4 +-
drivers/mtd/ar7part.c | 6 +
drivers/mtd/bcm47xxpart.c | 49 +-
drivers/mtd/chips/cfi_cmdset_0002.c | 217 ++++++++
drivers/mtd/cmdlinepart.c | 47 +-
drivers/mtd/devices/Makefile | 4 +-
drivers/mtd/devices/bcm47xxsflash.c | 55 +-
drivers/mtd/devices/bcm47xxsflash.h | 15 +
drivers/mtd/devices/elm.c | 404 ++++++++++++++
drivers/mtd/devices/m25p80.c | 100 ++++
drivers/mtd/maps/Kconfig | 2 +-
drivers/mtd/maps/physmap_of.c | 9 +-
drivers/mtd/maps/uclinux.c | 30 +-
drivers/mtd/nand/atmel_nand.c | 141 ++++-
drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 4 +
drivers/mtd/nand/bcm47xxnflash/main.c | 14 +-
drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 4 +-
drivers/mtd/nand/davinci_nand.c | 24 +-
drivers/mtd/nand/fsl_ifc_nand.c | 233 ++++----
drivers/mtd/nand/gpmi-nand/bch-regs.h | 22 +
drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 9 +
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 63 ++-
drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 4 +
drivers/mtd/nand/mxc_nand.c | 11 +
drivers/mtd/nand/nand_base.c | 8 +-
drivers/mtd/nand/nand_ecc.c | 5 +-
drivers/mtd/nand/nandsim.c | 6 +-
drivers/mtd/nand/omap2.c | 583 +++++++++++++++++++--
drivers/mtd/ofpart.c | 7 +
drivers/mtd/tests/mtd_nandecctest.c | 10 +-
drivers/mtd/tests/mtd_stresstest.c | 8 +-
drivers/mtd/tests/mtd_torturetest.c | 25 +-
drivers/mtd/ubi/debug.h | 6 +-
include/linux/bcma/bcma_driver_chipcommon.h | 1 +
include/linux/mtd/map.h | 9 +-
include/linux/platform_data/elm.h | 54 ++
38 files changed, 1881 insertions(+), 331 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mtd/elm.txt
create mode 100644 drivers/mtd/devices/bcm47xxsflash.h
create mode 100644 drivers/mtd/devices/elm.c
create mode 100644 include/linux/platform_data/elm.h
Merging crypto/master (7eb9c5d crypto: caam - Added property fsl,sec-era in SEC4.0 device tree binding.)
$ git merge crypto/master
Already up-to-date.
Merging drm/drm-next (be88298 drm/tilcdc: only build on arm)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-intel/drm-intel-next-queued (90a72f8 drm/i915: Refactor gen2 to gen4 vblank interrupt handling)
$ git merge drm-intel/drm-intel-next-queued
Auto-merging include/linux/pm.h
Auto-merging drivers/video/fbmem.c
Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
Auto-merging drivers/gpu/drm/i915/intel_drv.h
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/intel_ddi.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/i915_dma.c | 18 ++++++
drivers/gpu/drm/i915/i915_drv.c | 35 +++++++----
drivers/gpu/drm/i915/i915_irq.c | 119 ++++++++++++++++++++++++-----------
drivers/gpu/drm/i915/i915_reg.h | 4 ++
drivers/gpu/drm/i915/i915_suspend.c | 8 ++-
drivers/gpu/drm/i915/i915_sysfs.c | 16 ++---
drivers/gpu/drm/i915/intel_ddi.c | 4 +-
drivers/gpu/drm/i915/intel_display.c | 46 ++++++++++++--
drivers/gpu/drm/i915/intel_dp.c | 77 ++++++++---------------
drivers/gpu/drm/i915/intel_drv.h | 7 ++-
drivers/gpu/drm/i915/intel_hdmi.c | 74 +++++++++++-----------
drivers/video/fbmem.c | 7 +++
include/linux/fb.h | 2 +
include/linux/pm.h | 13 ++++
kernel/power/console.c | 116 ++++++++++++++++++++++++++++++++++
15 files changed, 389 insertions(+), 157 deletions(-)
Merging sound/for-next (d0ec95f ALSA: emu10k1: Allow to switch hardware sampe rate on EMU)
$ git merge sound/for-next
Already up-to-date.
Merging sound-asoc/for-next (5475931 Merge remote-tracking branch 'asoc/topic/da7213' into asoc-next)
$ git merge sound-asoc/for-next
Already up-to-date.
Merging modules/modules-next (fffddfd Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux)
$ git merge modules/modules-next
Already up-to-date.
Merging pekey/devel-pekey (4ea349d MODSIGN: Fix including certificate twice when the signing_key.x509 already exists)
$ git merge pekey/devel-pekey
Auto-merging kernel/system_certificates.S
Removing kernel/modsign_pubkey.c
Auto-merging kernel/Makefile
Auto-merging init/Kconfig
Merge made by the 'recursive' strategy.
crypto/asymmetric_keys/Kconfig | 20 +-
crypto/asymmetric_keys/Makefile | 30 ++
crypto/asymmetric_keys/mscode.asn1 | 28 ++
crypto/asymmetric_keys/mscode_parser.c | 110 +++++
crypto/asymmetric_keys/pefile_parser.c | 479 +++++++++++++++++++++
crypto/asymmetric_keys/pefile_parser.h | 36 ++
crypto/asymmetric_keys/pkcs7.asn1 | 127 ++++++
crypto/asymmetric_keys/pkcs7_parser.c | 326 ++++++++++++++
crypto/asymmetric_keys/pkcs7_parser.h | 72 ++++
crypto/asymmetric_keys/pkcs7_trust.c | 149 +++++++
crypto/asymmetric_keys/pkcs7_verify.c | 260 +++++++++++
crypto/asymmetric_keys/public_key.c | 60 ++-
crypto/asymmetric_keys/public_key.h | 6 +
crypto/asymmetric_keys/x509.asn1 | 2 +-
crypto/asymmetric_keys/x509_cert_parser.c | 55 ++-
crypto/asymmetric_keys/x509_parser.h | 28 +-
crypto/asymmetric_keys/x509_public_key.c | 119 ++---
include/crypto/public_key.h | 9 +-
include/keys/system_keyring.h | 23 +
include/linux/key-type.h | 1 +
include/linux/key.h | 3 +
include/linux/oid_registry.h | 7 +-
include/linux/pe.h | 448 +++++++++++++++++++
init/Kconfig | 13 +
kernel/Makefile | 47 +-
kernel/modsign_pubkey.c | 104 -----
kernel/module-internal.h | 2 -
kernel/module_signing.c | 7 +-
...modsign_certificate.S => system_certificates.S} | 7 +-
kernel/system_keyring.c | 103 +++++
security/keys/key.c | 8 +
security/keys/keyring.c | 4 +
32 files changed, 2478 insertions(+), 215 deletions(-)
create mode 100644 crypto/asymmetric_keys/mscode.asn1
create mode 100644 crypto/asymmetric_keys/mscode_parser.c
create mode 100644 crypto/asymmetric_keys/pefile_parser.c
create mode 100644 crypto/asymmetric_keys/pefile_parser.h
create mode 100644 crypto/asymmetric_keys/pkcs7.asn1
create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c
create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h
create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c
create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c
create mode 100644 include/keys/system_keyring.h
create mode 100644 include/linux/pe.h
delete mode 100644 kernel/modsign_pubkey.c
rename kernel/{modsign_certificate.S => system_certificates.S} (72%)
create mode 100644 kernel/system_keyring.c
Merging virtio/virtio-next (6515925 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
$ git merge virtio/virtio-next
Already up-to-date.
Merging input/next (005a69d Input: cyttsp-spi - remove duplicate MODULE_ALIAS())
$ git merge input/next
Already up-to-date.
Merging input-mt/for-next (6f0c058 Linux 3.7-rc2)
$ git merge input-mt/for-next
Already up-to-date.
Merging cgroup/for-next (5d30b00 Merge branch 'for-3.9' into for-next)
$ git merge cgroup/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next)
$ git merge block/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging device-mapper/master (8678bfa A simple cache policy that writes back all data to the origin.)
$ git merge device-mapper/master
Auto-merging drivers/md/dm.c
Auto-merging drivers/md/dm-snap.c
Auto-merging drivers/md/dm-raid.c
Auto-merging drivers/md/dm-bufio.c
Auto-merging drivers/md/dm-bio-prison.c
Auto-merging drivers/md/Kconfig
Merge made by the 'recursive' strategy.
Documentation/device-mapper/cache-policies.txt | 51 +
Documentation/device-mapper/cache.txt | 266 +++
drivers/md/Kconfig | 55 +-
drivers/md/Makefile | 6 +
drivers/md/dm-bio-prison.c | 155 +-
drivers/md/dm-bio-prison.h | 58 +-
drivers/md/dm-bufio.c | 2 +-
drivers/md/dm-cache-block-types.h | 54 +
drivers/md/dm-cache-metadata.c | 1146 +++++++++++
drivers/md/dm-cache-metadata.h | 142 ++
drivers/md/dm-cache-policy-cleaner.c | 465 +++++
drivers/md/dm-cache-policy-internal.h | 124 ++
drivers/md/dm-cache-policy-mq.c | 1194 +++++++++++
drivers/md/dm-cache-policy.c | 161 ++
drivers/md/dm-cache-policy.h | 228 +++
drivers/md/dm-cache-target.c | 2565 ++++++++++++++++++++++++
drivers/md/dm-crypt.c | 45 +-
drivers/md/dm-delay.c | 12 +-
drivers/md/dm-flakey.c | 11 +-
drivers/md/dm-ioctl.c | 130 +-
drivers/md/dm-kcopyd.c | 121 +-
drivers/md/dm-linear.c | 13 +-
drivers/md/dm-mpath.c | 12 +-
drivers/md/dm-raid.c | 10 +-
drivers/md/dm-raid1.c | 17 +-
drivers/md/dm-snap.c | 33 +-
drivers/md/dm-stripe.c | 27 +-
drivers/md/dm-table.c | 11 +-
drivers/md/dm-target.c | 2 +-
drivers/md/dm-thin-metadata.c | 12 +-
drivers/md/dm-thin.c | 277 ++-
drivers/md/dm-verity.c | 8 +-
drivers/md/dm-zero.c | 2 +-
drivers/md/dm.c | 452 +++--
drivers/md/persistent-data/Kconfig | 2 +-
drivers/md/persistent-data/Makefile | 2 +
drivers/md/persistent-data/dm-array.c | 808 ++++++++
drivers/md/persistent-data/dm-array.h | 166 ++
drivers/md/persistent-data/dm-bitset.c | 163 ++
drivers/md/persistent-data/dm-bitset.h | 165 ++
drivers/md/persistent-data/dm-block-manager.c | 1 +
drivers/md/persistent-data/dm-btree-internal.h | 1 +
drivers/md/persistent-data/dm-btree-spine.c | 7 +
drivers/md/persistent-data/dm-btree.c | 52 +
drivers/md/persistent-data/dm-btree.h | 15 +-
include/linux/device-mapper.h | 49 +-
include/linux/dm-kcopyd.h | 25 +-
include/uapi/linux/dm-ioctl.h | 6 +-
48 files changed, 8729 insertions(+), 600 deletions(-)
create mode 100644 Documentation/device-mapper/cache-policies.txt
create mode 100644 Documentation/device-mapper/cache.txt
create mode 100644 drivers/md/dm-cache-block-types.h
create mode 100644 drivers/md/dm-cache-metadata.c
create mode 100644 drivers/md/dm-cache-metadata.h
create mode 100644 drivers/md/dm-cache-policy-cleaner.c
create mode 100644 drivers/md/dm-cache-policy-internal.h
create mode 100644 drivers/md/dm-cache-policy-mq.c
create mode 100644 drivers/md/dm-cache-policy.c
create mode 100644 drivers/md/dm-cache-policy.h
create mode 100644 drivers/md/dm-cache-target.c
create mode 100644 drivers/md/persistent-data/dm-array.c
create mode 100644 drivers/md/persistent-data/dm-array.h
create mode 100644 drivers/md/persistent-data/dm-bitset.c
create mode 100644 drivers/md/persistent-data/dm-bitset.h
$ git am -3 ../patches/0001-hlist-drop-the-node-parameter-from-iterators-dm-cach.patch
Applying: hlist-drop-the-node-parameter-from-iterators-dm-cache-policy-fix
$ git reset HEAD^
Unstaged changes after reset:
M drivers/md/dm-cache-policy-cleaner.c
M drivers/md/dm-cache-policy-mq.c
$ git add -A .
$ git commit -v -a --amend
[master db572d5] Merge branch 'device-mapper/master'
Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
$ git merge embedded/master
Already up-to-date.
Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
$ git merge firmware/master
Already up-to-date.
Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (adf96e6 sysrq: don't depend on weak undefined arrays to have an address that compares as NULL)
$ git merge mmc/mmc-next
Already up-to-date.
Merging kgdb/kgdb-next (58bcdf6 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
Merging slab/for-next (7d557b3 slub: correctly bootstrap boot caches)
$ git merge slab/for-next
Auto-merging mm/slub.c
Auto-merging mm/slab.c
Removing include/linux/kmalloc_sizes.h
Merge made by the 'recursive' strategy.
fs/proc/stat.c | 2 +-
include/linux/kmalloc_sizes.h | 45 ---
include/linux/slab.h | 231 +++++++++----
include/linux/slab_def.h | 48 +--
include/linux/slub_def.h | 136 +-------
mm/slab.c | 789 ++++++++++++++++++------------------------
mm/slab.h | 43 ++-
mm/slab_common.c | 165 ++++++++-
mm/slub.c | 188 ++--------
9 files changed, 745 insertions(+), 902 deletions(-)
delete mode 100644 include/linux/kmalloc_sizes.h
Merging uclinux/for-next (b69f085 Linux 3.7-rc8)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (f1e79ce raid5: create multiple threads to handle stripes)
$ git merge md/for-next
Auto-merging drivers/md/raid5.c
Merge made by the 'recursive' strategy.
drivers/md/md.c | 8 +-
drivers/md/md.h | 8 ++
drivers/md/raid5.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++---
drivers/md/raid5.h | 19 +++
4 files changed, 419 insertions(+), 24 deletions(-)
Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data)
$ git merge mfd/for-next
Already up-to-date.
Merging battery/master (845e37e Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux)
$ git merge battery/master
Resolved 'include/linux/mfd/abx500/ab8500-bm.h' using previous resolution.
Auto-merging include/linux/mfd/abx500/ab8500-bm.h
CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8d82dd0] Merge remote-tracking branch 'battery/master'
$ git diff -M --stat --summary HEAD^..
Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1)
$ git merge fbdev/fbdev-next
Already up-to-date.
Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
$ git merge viafb/viafb-next
Already up-to-date.
Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (2730fd8 Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next)
$ git merge regulator/for-next
Already up-to-date.
Merging security/next (5b26603 tpm/ibmvtpm: build only when IBM pseries is configured)
$ git merge security/next
Already up-to-date.
Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
$ git merge selinux/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
$ git merge lblnet/master
Already up-to-date.
Merging watchdog/master (9ebe0e8 watchdog: sp805_wdt depends on ARM)
$ git merge watchdog/master
Resolved 'drivers/rtc/rtc-stmp3xxx.c' using previous resolution.
Resolved 'drivers/watchdog/Kconfig' using previous resolution.
Resolved 'drivers/watchdog/Makefile' using previous resolution.
Removing drivers/watchdog/stmp3xxx_wdt.c
Auto-merging drivers/watchdog/pnx4008_wdt.c
Auto-merging drivers/watchdog/at91sam9_wdt.c
Auto-merging drivers/watchdog/Makefile
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
Auto-merging drivers/watchdog/Kconfig
CONFLICT (content): Merge conflict in drivers/watchdog/Kconfig
Auto-merging drivers/rtc/rtc-stmp3xxx.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-stmp3xxx.c
Auto-merging arch/mips/ath79/dev-common.c
Auto-merging Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 06c1981] Merge remote-tracking branch 'watchdog/master'
$ git diff -M --stat --summary HEAD^..
.../bindings/watchdog/atmel-at91rm9200-wdt.txt | 9 +
.../devicetree/bindings/watchdog/atmel-wdt.txt | 4 +
.../devicetree/bindings/watchdog/marvel.txt | 5 +
.../devicetree/bindings/watchdog/pnx4008-wdt.txt | 4 +
.../bindings/watchdog/qca-ar7130-wdt.txt | 13 +
.../devicetree/bindings/watchdog/samsung-wdt.txt | 3 +
Documentation/watchdog/watchdog-kernel-api.txt | 14 +-
arch/mips/ath79/dev-common.c | 15 +-
drivers/rtc/rtc-stmp3xxx.c | 64 ++++
drivers/watchdog/Kconfig | 35 ++-
drivers/watchdog/Makefile | 3 +-
drivers/watchdog/at91rm9200_wdt.c | 9 +
drivers/watchdog/at91sam9_wdt.c | 168 +++-------
drivers/watchdog/ath79_wdt.c | 66 +++-
drivers/watchdog/bcm47xx_wdt.c | 339 +++++++++------------
drivers/watchdog/booke_wdt.c | 185 ++++-------
drivers/watchdog/davinci_wdt.c | 29 +-
drivers/watchdog/gef_wdt.c | 1 +
drivers/watchdog/omap_wdt.c | 6 +-
drivers/watchdog/orion_wdt.c | 11 +-
drivers/watchdog/pnx4008_wdt.c | 7 +-
drivers/watchdog/retu_wdt.c | 178 +++++++++++
drivers/watchdog/s3c2410_wdt.c | 48 +--
drivers/watchdog/sp5100_tco.c | 27 +-
drivers/watchdog/stmp3xxx_rtc_wdt.c | 111 +++++++
drivers/watchdog/stmp3xxx_wdt.c | 288 -----------------
drivers/watchdog/watchdog_core.c | 66 +++-
drivers/watchdog/watchdog_dev.c | 3 +-
include/linux/bcm47xx_wdt.h | 9 +
include/linux/stmp3xxx_rtc_wdt.h | 15 +
include/linux/watchdog.h | 9 +
31 files changed, 888 insertions(+), 856 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/atmel-at91rm9200-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/qca-ar7130-wdt.txt
create mode 100644 drivers/watchdog/retu_wdt.c
create mode 100644 drivers/watchdog/stmp3xxx_rtc_wdt.c
delete mode 100644 drivers/watchdog/stmp3xxx_wdt.c
create mode 100644 include/linux/stmp3xxx_rtc_wdt.h
Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging iommu/next (604542b Merge branches 'core', 'arm/omap', 'iommu/fixes', 'arm/tegra', 'arm/shmobile', 'arm/exynos', 'x86/vt-d' and 'x86/amd' into next)
$ git merge iommu/next
Already up-to-date.
Merging vfio/next (d65530f drivers/vfio: remove depends on CONFIG_EXPERIMENTAL)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (5c050fb docs: update the development process document)
$ git merge jc_docs/docs-next
Already up-to-date.
Merging trivial/for-next (df63447 DocBook: update EXPORT_SYMBOL entry to point at export.h)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
$ git merge audit/for-next
Already up-to-date.
Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging edac/linux_next (b076989 i5100_edac: convert to use simple_open())
$ git merge edac/linux_next
Auto-merging include/linux/pci_ids.h
Auto-merging drivers/edac/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 7 +
drivers/acpi/apei/ghes.c | 71 ++----
drivers/edac/Kconfig | 23 ++
drivers/edac/Makefile | 1 +
drivers/edac/edac_core.h | 5 +
drivers/edac/edac_mc.c | 152 +++++++-----
drivers/edac/edac_mc_sysfs.c | 36 ++-
drivers/edac/edac_module.c | 2 +-
drivers/edac/edac_pci_sysfs.c | 2 +-
drivers/edac/ghes_edac.c | 537 ++++++++++++++++++++++++++++++++++++++++++
drivers/edac/i3200_edac.c | 37 ++-
drivers/edac/i5100_edac.c | 178 +++++++++++++-
drivers/edac/i7core_edac.c | 8 +-
drivers/edac/sb_edac.c | 2 +-
include/acpi/ghes.h | 72 ++++++
include/linux/edac.h | 79 ++++++-
include/linux/pci_ids.h | 1 +
include/ras/ras_event.h | 4 +-
18 files changed, 1077 insertions(+), 140 deletions(-)
create mode 100644 drivers/edac/ghes_edac.c
create mode 100644 include/acpi/ghes.h
Merging edac-amd/for-next (e7d2c21 mpc85xx_edac: Fix typo)
$ git merge edac-amd/for-next
Already up-to-date.
Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add")
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt)
$ git merge dt-rh/for-next
Already up-to-date.
Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc)
$ git merge spi/spi/next
Already up-to-date.
Merging spi-mb/spi-next (a349685 spi/pxa2xx: add support for Lynxpoint SPI controllers)
$ git merge spi-mb/spi-next
Already up-to-date.
Merging tip/auto-latest (641e71a Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Resolved 'arch/x86/include/asm/pgtable.h' using previous resolution.
Auto-merging kernel/printk.c
Auto-merging arch/x86/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/pgtable.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 80f32ac] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
arch/x86/include/asm/pgtable.h | 1 -
kernel/printk.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
Merging ftrace/for-next (6c895ca tracing: Add rmdir to remove multibuffer instances)
$ git merge ftrace/for-next
Merge made by the 'recursive' strategy.
include/linux/ftrace_event.h | 58 ++-
include/trace/ftrace.h | 12 +-
kernel/trace/trace.c | 819 ++++++++++++++++++++++++-----------
kernel/trace/trace.h | 76 +++-
kernel/trace/trace_branch.c | 6 +-
kernel/trace/trace_events.c | 819 ++++++++++++++++++++++++-----------
kernel/trace/trace_events_filter.c | 5 +-
kernel/trace/trace_functions.c | 4 +-
kernel/trace/trace_functions_graph.c | 4 +-
kernel/trace/trace_irqsoff.c | 6 +-
kernel/trace/trace_kdb.c | 4 +-
kernel/trace/trace_mmiotrace.c | 4 +-
kernel/trace/trace_sched_switch.c | 4 +-
kernel/trace/trace_sched_wakeup.c | 14 +-
kernel/trace/trace_syscalls.c | 80 ++--
15 files changed, 1331 insertions(+), 584 deletions(-)
$ git reset --hard HEAD^
HEAD is now at 80f32ac Merge remote-tracking branch 'tip/auto-latest'
Merging 20130228 version of ftrace
$ git merge -m 20130228/ftrace 8c189ea64eea01ca20d102ddb74d6936dd16c579
Already up-to-date.
Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock())
$ git merge rcu/rcu/next
Already up-to-date.
Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
$ git merge cputime/cputime
Already up-to-date.
Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
$ git merge uprobes/for-next
Already up-to-date.
Merging kvm/linux-next (3ab66e8 KVM: VMX: Pass vcpu to __vmx_complete_interrupts)
$ git merge kvm/linux-next
Recorded preimage for 'arch/x86/kernel/kvmclock.c'
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kernel/kvmclock.c
CONFLICT (content): Merge conflict in arch/x86/kernel/kvmclock.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/x86/kernel/kvmclock.c'.
[master f93a2aa] Merge remote-tracking branch 'kvm/linux-next'
$ git diff -M --stat --summary HEAD^..
arch/x86/kernel/kvmclock.c | 9 +++-
arch/x86/kvm/vmx.c | 103 +++++++++++++++++++++++++++++++++------------
arch/x86/kvm/x86.c | 2 +-
3 files changed, 85 insertions(+), 29 deletions(-)
Merging kvm-ppc/kvm-ppc-next (bd31a7f KVM: nVMX: Trap unconditionally if msr bitmap access fails)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl())
$ git merge oprofile/for-next
Already up-to-date.
Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work)
$ git merge fw-nohz/nohz/next
Already up-to-date.
Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
$ git merge xen/upstream/xen
Already up-to-date.
Merging xen-two/linux-next (39ada15 Merge branch 'stable/for-linus-3.9-take-two' into linux-next)
$ git merge xen-two/linux-next
Auto-merging drivers/xen/events.c
Auto-merging drivers/net/xen-netback/netback.c
Auto-merging arch/x86/xen/setup.c
Auto-merging arch/x86/xen/mmu.c
Auto-merging arch/x86/xen/enlighten.c
Merge made by the 'recursive' strategy.
arch/x86/include/asm/xen/interface.h | 11 ++-
arch/x86/include/asm/xen/page.h | 3 +
arch/x86/xen/Kconfig | 10 +++
arch/x86/xen/enlighten.c | 76 ++++++++++++-----
arch/x86/xen/irq.c | 5 +-
arch/x86/xen/mmu.c | 159 ++++++++++++++++++++++++++++++++---
arch/x86/xen/mmu.h | 2 +
arch/x86/xen/p2m.c | 2 +-
arch/x86/xen/setup.c | 59 ++++++++++---
arch/x86/xen/smp.c | 39 ++++++---
arch/x86/xen/xen-head.S | 10 ++-
drivers/net/xen-netback/netback.c | 11 ++-
drivers/xen/balloon.c | 14 +--
drivers/xen/cpu_hotplug.c | 4 +-
drivers/xen/events.c | 9 +-
drivers/xen/gntdev.c | 3 +-
drivers/xen/grant-table.c | 115 +++++++++++++------------
drivers/xen/privcmd.c | 2 +-
drivers/xen/xenbus/xenbus_client.c | 9 +-
include/xen/grant_table.h | 12 ---
20 files changed, 415 insertions(+), 140 deletions(-)
$ git am -3 ../patches/0001-xen-fix-bad-merge-of-arch-x86-xen-mmu.c.patch
Applying: xen: fix bad merge of arch/x86/xen/mmu.c
$ git reset HEAD^
Unstaged changes after reset:
M arch/x86/xen/mmu.c
$ git add -A .
$ git commit -v -a --amend
[master ee972f5] Merge remote-tracking branch 'xen-two/linux-next'
Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
$ git merge xen-pvhvm/linux-next
Already up-to-date.
Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument)
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (a4791ca Merge branch 'for-3.9' into for-next)
$ git merge workqueues/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it)
$ git merge drivers-x86/linux-next
Auto-merging drivers/platform/x86/thinkpad_acpi.c
Auto-merging drivers/platform/x86/sony-laptop.c
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-platform-msi-laptop | 83 +++++
drivers/platform/x86/Kconfig | 15 +-
drivers/platform/x86/Makefile | 1 +
drivers/platform/x86/acer-wmi.c | 21 ++
drivers/platform/x86/asus-laptop.c | 85 +++--
drivers/platform/x86/asus-nb-wmi.c | 76 ++++-
drivers/platform/x86/asus-wmi.c | 108 +++++-
drivers/platform/x86/asus-wmi.h | 9 +
drivers/platform/x86/chromeos_laptop.c | 371 ++++++++++++++++++++
drivers/platform/x86/eeepc-wmi.c | 2 +
drivers/platform/x86/hp-wmi.c | 117 ++++---
drivers/platform/x86/msi-laptop.c | 374 ++++++++++++++++-----
drivers/platform/x86/msi-wmi.c | 224 +++++++-----
drivers/platform/x86/sony-laptop.c | 145 +++++++-
drivers/platform/x86/thinkpad_acpi.c | 17 +-
15 files changed, 1375 insertions(+), 273 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-platform-msi-laptop
create mode 100644 drivers/platform/x86/chromeos_laptop.c
Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
$ git merge hwpoison/hwpoison
Already up-to-date.
Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
$ git merge sysctl/master
Already up-to-date.
Merging regmap/for-next (a2b37ef Merge remote-tracking branch 'regmap/topic/no-bus' into regmap-next)
$ git merge regmap/for-next
Already up-to-date.
Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk())
$ git merge leds/for-next
Already up-to-date.
Merging driver-core/driver-core-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge tty/tty-next
Already up-to-date.
Merging usb/usb-next (74e1a2a Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb)
$ git merge usb/usb-next
Already up-to-date.
Merging staging/staging-next (8b5628a Merge tag 'virt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
$ git merge staging/staging-next
Already up-to-date.
Merging char-misc/char-misc-next (0988496 mm: do not grow the stack vma just because of an overrun on preceding vma)
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging tmem/linux-next (8f0d816 Linux 3.7-rc3)
$ git merge tmem/linux-next
Already up-to-date.
Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio())
$ git merge writeback/writeback-for-next
Already up-to-date.
Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
$ git merge arm-dt/devicetree/arm-next
Already up-to-date.
Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
$ git merge hwspinlock/linux-next
Already up-to-date.
Merging pinctrl/for-next (ade158e pinctrl: tegra: add clfvs function to Tegra114 support)
$ git merge pinctrl/for-next
Already up-to-date.
Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency)
$ git merge vhost/linux-next
Auto-merging drivers/vhost/Kconfig
Merge made by the 'recursive' strategy.
drivers/vhost/Kconfig | 1 +
drivers/vhost/Kconfig.blk | 10 +
drivers/vhost/Makefile | 2 +
drivers/vhost/blk.c | 727 ++++++++++++++++++++++++++++++++++++++++++++++
drivers/vhost/blk.h | 8 +
5 files changed, 748 insertions(+)
create mode 100644 drivers/vhost/Kconfig.blk
create mode 100644 drivers/vhost/blk.c
create mode 100644 drivers/vhost/blk.h
Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
$ git merge memblock/memblock-kill-early_node_map
Already up-to-date.
Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2)
$ git merge remoteproc/for-next
Already up-to-date.
Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq)
$ git merge irqdomain/irqdomain/next
Merge made by the 'recursive' strategy.
kernel/irq/irqdomain.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Merging gpio/gpio/next (9170100 arm64: select ARCH_WANT_OPTIONAL_GPIOLIB)
$ git merge gpio/gpio/next
Already up-to-date.
Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error)
$ git merge gpio-lw/for-next
Already up-to-date.
Merging arm-soc/for-next (1ead4fb Merge branch 'late/mvebu-dt' into for-next)
$ git merge arm-soc/for-next
Resolved 'arch/arm/boot/dts/armada-370-xp.dtsi' using previous resolution.
Resolved 'arch/arm/mach-omap2/board-4430sdp.c' using previous resolution.
Resolved 'drivers/mmc/card/block.c' using previous resolution.
Resolved 'drivers/mmc/core/core.c' using previous resolution.
Resolved 'drivers/mmc/core/sdio.c' using previous resolution.
Resolved 'drivers/mmc/host/sdhci-bcm2835.c' using previous resolution.
Resolved 'drivers/mmc/host/sdhci-esdhc-imx.c' using previous resolution.
Resolved 'drivers/mmc/host/sdhci-pxav3.c' using previous resolution.
Resolved 'drivers/mmc/host/sh_mmcif.c' using previous resolution.
Resolved 'include/linux/mmc/host.h' using previous resolution.
Auto-merging include/linux/mmc/host.h
CONFLICT (content): Merge conflict in include/linux/mmc/host.h
Auto-merging drivers/w1/masters/mxc_w1.c
Auto-merging drivers/mmc/host/sh_mmcif.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sh_mmcif.c
Auto-merging drivers/mmc/host/sdhci-pxav3.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-pxav3.c
Auto-merging drivers/mmc/host/sdhci-esdhc-imx.c
CONFLICT (content): Merge conflict in drivers/mmc/host/sdhci-esdhc-imx.c
Auto-merging drivers/mmc/host/sdhci-bcm2835.c
CONFLICT (add/add): Merge conflict in drivers/mmc/host/sdhci-bcm2835.c
Auto-merging drivers/mmc/core/sdio.c
CONFLICT (content): Merge conflict in drivers/mmc/core/sdio.c
Auto-merging drivers/mmc/core/core.c
CONFLICT (content): Merge conflict in drivers/mmc/core/core.c
Auto-merging drivers/mmc/card/block.c
CONFLICT (content): Merge conflict in drivers/mmc/card/block.c
Auto-merging drivers/media/platform/omap3isp/isp.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Auto-merging arch/arm/mach-omap2/devices.c
Auto-merging arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
Auto-merging arch/arm/boot/dts/imx27-pdk.dts
Auto-merging arch/arm/boot/dts/armada-370-xp.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/armada-370-xp.dtsi
Auto-merging arch/arm/Kconfig
Auto-merging Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 86635a1] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/armadeus.txt | 6 +
Documentation/devicetree/bindings/arm/fsl.txt | 8 +
.../devicetree/bindings/clock/imx5-clock.txt | 1 +
.../devicetree/bindings/clock/imx6q-clock.txt | 2 +
.../marvell,armada-370-xp-timer.txt} | 11 +-
.../devicetree/bindings/w1/fsl-imx-owire.txt | 19 +
arch/arm/Kconfig | 1 -
arch/arm/arm-soc-for-next-contents.txt | 398 ++++++++++
arch/arm/boot/dts/Makefile | 13 +-
arch/arm/boot/dts/am33xx.dtsi | 14 +
arch/arm/boot/dts/armada-370-db.dts | 35 +
arch/arm/boot/dts/armada-370-mirabox.dts | 18 +
arch/arm/boot/dts/armada-370-rd.dts | 68 ++
arch/arm/boot/dts/armada-370-xp.dtsi | 49 +-
arch/arm/boot/dts/armada-370.dtsi | 21 +
arch/arm/boot/dts/armada-xp-db.dts | 31 +
arch/arm/boot/dts/armada-xp-gp.dts | 113 +++
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 6 +
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 6 +
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 18 +
arch/arm/boot/dts/armada-xp.dtsi | 19 +-
arch/arm/boot/dts/dove-cubox.dts | 28 +-
arch/arm/boot/dts/dove.dtsi | 24 +-
arch/arm/boot/dts/imx25-karo-tx25.dts | 30 +-
arch/arm/boot/dts/imx25-pdk.dts | 36 +
arch/arm/boot/dts/imx25.dtsi | 2 +-
arch/arm/boot/dts/imx27-apf27.dts | 82 +--
arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} | 24 +-
arch/arm/boot/dts/imx31-bug.dts | 12 +-
arch/arm/boot/dts/imx51-apf51.dts | 52 ++
arch/arm/boot/dts/imx51-babbage.dts | 478 ++++++------
arch/arm/boot/dts/imx51.dtsi | 53 ++
arch/arm/boot/dts/imx53-ard.dts | 126 ++--
arch/arm/boot/dts/imx53-evk.dts | 194 +++--
arch/arm/boot/dts/imx53-mba53.dts | 130 ++++
arch/arm/boot/dts/imx53-qsb.dts | 380 +++++-----
arch/arm/boot/dts/imx53-smd.dts | 294 ++++----
arch/arm/boot/dts/imx53-tqma53.dtsi | 172 +++++
arch/arm/boot/dts/imx53.dtsi | 68 ++
arch/arm/boot/dts/imx6dl.dtsi | 59 ++
arch/arm/boot/dts/imx6q-arm2.dts | 124 ++--
arch/arm/boot/dts/imx6q-sabreauto.dts | 64 +-
arch/arm/boot/dts/imx6q-sabrelite.dts | 216 +++---
arch/arm/boot/dts/imx6q-sabresd.dts | 102 ++-
arch/arm/boot/dts/imx6q.dtsi | 796 +-------------------
arch/arm/boot/dts/imx6qdl.dtsi | 800 +++++++++++++++++++++
arch/arm/boot/dts/kirkwood-6282.dtsi | 17 +
arch/arm/boot/dts/kirkwood-dreamplug.dts | 7 +
.../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 94 +++
arch/arm/boot/dts/kirkwood-mplcec4.dts | 11 +-
arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 +
arch/arm/boot/dts/kirkwood-nsa310.dts | 126 ++++
arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 116 +++
arch/arm/boot/dts/kirkwood-topkick.dts | 102 +++
arch/arm/boot/dts/kirkwood.dtsi | 8 +
arch/arm/configs/dove_defconfig | 28 +-
arch/arm/configs/mvebu_defconfig | 26 +-
arch/arm/mach-dove/Kconfig | 7 +
arch/arm/mach-dove/Makefile | 4 +-
arch/arm/mach-dove/board-dt.c | 92 +++
arch/arm/mach-dove/common.c | 85 ---
arch/arm/mach-imx/clk-imx51-imx53.c | 4 +-
arch/arm/mach-imx/clk-imx6q.c | 26 +-
arch/arm/mach-imx/mach-imx6q.c | 65 ++
arch/arm/mach-kirkwood/Kconfig | 7 +
arch/arm/mach-kirkwood/Makefile | 1 +
arch/arm/mach-kirkwood/board-dreamplug.c | 6 -
arch/arm/mach-kirkwood/board-dt.c | 16 +-
arch/arm/mach-kirkwood/board-guruplug.c | 39 +
arch/arm/mach-kirkwood/board-mplcec4.c | 7 -
arch/arm/mach-kirkwood/board-ns2.c | 14 -
arch/arm/mach-kirkwood/board-nsa310.c | 68 --
arch/arm/mach-kirkwood/board-openblocks_a6.c | 44 --
arch/arm/mach-kirkwood/board-usi_topkick.c | 48 --
arch/arm/mach-kirkwood/common.h | 11 +-
arch/arm/mach-mvebu/irq-armada-370-xp.c | 87 ++-
arch/arm/mach-omap2/Makefile | 3 +-
arch/arm/mach-omap2/am33xx-restart.c | 34 +
arch/arm/mach-omap2/am35xx-emac.c | 3 +-
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/cclock33xx_data.c | 10 +-
arch/arm/mach-omap2/cclock3xxx_data.c | 10 +-
arch/arm/mach-omap2/cclock44xx_data.c | 13 +-
arch/arm/mach-omap2/clock.h | 11 +
arch/arm/mach-omap2/cm33xx.c | 3 -
arch/arm/mach-omap2/cm33xx.h | 9 +-
arch/arm/mach-omap2/common.h | 8 +
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dpll3xxx.c | 5 +-
arch/arm/mach-omap2/id.c | 14 +-
arch/arm/mach-omap2/omap_hwmod.c | 23 +-
arch/arm/mach-omap2/omap_hwmod.h | 8 +
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 443 +++++++-----
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 51 +-
arch/arm/mach-omap2/omap_hwmod_reset.c | 53 ++
arch/arm/mach-omap2/pm.c | 20 +-
arch/arm/mach-omap2/pm24xx.c | 12 +-
arch/arm/mach-omap2/pm44xx.c | 21 +-
arch/arm/mach-omap2/prm33xx.c | 11 +-
arch/arm/mach-omap2/prm33xx.h | 4 +-
arch/arm/mach-omap2/sleep24xx.S | 19 -
arch/arm/mach-omap2/soc.h | 1 +
arch/arm/mach-omap2/sr_device.c | 2 +-
arch/arm/plat-omap/Kconfig | 9 -
arch/arm/plat-omap/include/plat/timex.h | 8 -
drivers/clocksource/time-armada-370-xp.c | 150 +++-
drivers/media/platform/omap3isp/isp.c | 18 +-
drivers/media/platform/omap3isp/isp.h | 8 +-
drivers/w1/masters/mxc_w1.c | 9 +-
include/sound/aess.h | 53 ++
112 files changed, 4905 insertions(+), 2532 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/armadeus.txt
rename Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%)
create mode 100644 Documentation/devicetree/bindings/w1/fsl-imx-owire.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/armada-370-rd.dts
create mode 100644 arch/arm/boot/dts/armada-xp-gp.dts
create mode 100644 arch/arm/boot/dts/imx25-pdk.dts
rename arch/arm/boot/dts/{imx27-3ds.dts => imx27-pdk.dts} (59%)
create mode 100644 arch/arm/boot/dts/imx51-apf51.dts
create mode 100644 arch/arm/boot/dts/imx53-mba53.dts
create mode 100644 arch/arm/boot/dts/imx53-tqma53.dtsi
create mode 100644 arch/arm/boot/dts/imx6dl.dtsi
create mode 100644 arch/arm/boot/dts/imx6qdl.dtsi
create mode 100644 arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
create mode 100644 arch/arm/mach-dove/board-dt.c
create mode 100644 arch/arm/mach-kirkwood/board-guruplug.c
create mode 100644 arch/arm/mach-omap2/am33xx-restart.c
create mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c
create mode 100644 include/sound/aess.h
Merging bcm2835/for-next (836dc9e Linux 3.8-rc7)
$ git merge bcm2835/for-next
Already up-to-date.
Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n)
$ git merge cortex/for-next
Resolved 'arch/arm/include/asm/cputype.h' using previous resolution.
Auto-merging arch/arm/mm/mmu.c
Auto-merging arch/arm/mm/alignment.c
Auto-merging arch/arm/mm/Kconfig
Auto-merging arch/arm/mach-omap2/omap-smp.c
Auto-merging arch/arm/mach-omap2/id.c
Auto-merging arch/arm/kernel/smp_scu.c
Auto-merging arch/arm/include/asm/cputype.h
CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h
Auto-merging arch/arm/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a4cb821] Merge remote-tracking branch 'cortex/for-next'
$ git diff -M --stat --summary HEAD^..
arch/arm/Kconfig | 3 ++-
arch/arm/include/asm/cp15.h | 16 +++++++++++++++-
arch/arm/include/asm/cputype.h | 31 +++++++++++++++++++++++++++----
arch/arm/include/asm/glue-df.h | 20 ++++++++++----------
arch/arm/kernel/head-common.S | 9 +++++++--
arch/arm/kernel/head-nommu.S | 8 +++++++-
arch/arm/kernel/setup.c | 2 +-
arch/arm/kernel/smp_scu.c | 2 +-
arch/arm/mach-omap2/id.c | 4 ++--
arch/arm/mach-omap2/omap-smp.c | 2 +-
arch/arm/mm/Kconfig | 9 ++++++++-
arch/arm/mm/alignment.c | 2 ++
arch/arm/mm/mmu.c | 17 +++++++++++++++++
13 files changed, 100 insertions(+), 25 deletions(-)
Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
$ git merge ep93xx/ep93xx-for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ixp4xx/next (b94740b IXP4xx: use __iomem for MMIO)
$ git merge ixp4xx/next
Merge made by the 'recursive' strategy.
Merging msm/for-next (a0d271c Linux 3.6)
$ git merge msm/for-next
Already up-to-date.
Merging renesas/next (1b8b1c3 Merge branches 'heads/defconfig', 'heads/boards3', 'heads/pfc' and 'heads/clocksource' into next)
$ git merge renesas/next
Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/board-mackerel.c' using previous resolution.
Resolved 'arch/arm/mach-shmobile/setup-sh73a0.c' using previous resolution.
Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c
Removing arch/arm/mach-shmobile/hotplug.c
Auto-merging arch/arm/mach-shmobile/headsmp-scu.S
Auto-merging arch/arm/mach-shmobile/board-mackerel.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-mackerel.c
Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
Auto-merging arch/arm/boot/dts/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d81000d] Merge remote-tracking branch 'renesas/next'
$ git diff -M --stat --summary HEAD^..
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 ++++++
arch/arm/boot/dts/r8a7779.dtsi | 86 ++++++++++
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 +++++++++
arch/arm/configs/armadillo800eva_defconfig | 1 +
arch/arm/configs/kzm9g_defconfig | 1 -
arch/arm/configs/mackerel_defconfig | 4 +
arch/arm/mach-shmobile/Kconfig | 27 +++
arch/arm/mach-shmobile/Makefile | 9 +-
arch/arm/mach-shmobile/board-armadillo800eva.c | 144 ++++++++++++----
arch/arm/mach-shmobile/board-kzm9g-reference.c | 104 ++++++++++++
arch/arm/mach-shmobile/board-mackerel.c | 106 +++++-------
arch/arm/mach-shmobile/board-marzen-reference.c | 72 ++++++++
arch/arm/mach-shmobile/board-marzen.c | 1 +
arch/arm/mach-shmobile/clock-r8a7740.c | 4 +
arch/arm/mach-shmobile/clock-sh73a0.c | 7 +-
.../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +-
arch/arm/mach-shmobile/hotplug.c | 68 --------
arch/arm/mach-shmobile/include/mach/common.h | 18 +-
arch/arm/mach-shmobile/intc-r8a7779.c | 27 ++-
arch/arm/mach-shmobile/intc-sh73a0.c | 8 -
arch/arm/mach-shmobile/setup-emev2.c | 4 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 54 +++++-
arch/arm/mach-shmobile/setup-sh73a0.c | 36 ++--
arch/arm/mach-shmobile/smp-emev2.c | 86 ++--------
arch/arm/mach-shmobile/smp-r8a7779.c | 129 +++++++-------
arch/arm/mach-shmobile/smp-sh73a0.c | 36 ++--
drivers/clocksource/sh_cmt.c | 187 +++++++++++++--------
28 files changed, 889 insertions(+), 471 deletions(-)
create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts
create mode 100644 arch/arm/boot/dts/r8a7779.dtsi
create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c
create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c
rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%)
delete mode 100644 arch/arm/mach-shmobile/hotplug.c
Merging samsung/for-next (786b270 Merge branch 'next/cpufreq-exynos' into for-next)
$ git merge samsung/for-next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/exynos5440.dtsi | 5 -----
arch/arm/mach-s5pc100/common.h | 9 ---------
arch/arm/mach-s5pv210/common.h | 9 ---------
3 files changed, 23 deletions(-)
Merging tegra/for-next (19f949f Linux 3.8)
$ git merge tegra/for-next
Already up-to-date.
Merging dma-mapping/dma-mapping-next (d589829 ARM: DMA-mapping: fix memory leak in IOMMU dma-mapping implementation)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (a32e1d1 pwm_backlight: remove unnecessary ifdefs)
$ git merge pwm/for-next
Auto-merging drivers/video/backlight/pwm_bl.c
Merge made by the 'recursive' strategy.
drivers/video/backlight/pwm_bl.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
Merging dma-buf/for-next (495c10c CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap)
$ git merge dma-buf/for-next
Merge made by the 'recursive' strategy.
Documentation/dma-buf-sharing.txt | 6 +++-
drivers/base/dma-buf.c | 66 ++++++++++++++++++++++++++++++++-------
include/linux/dma-buf.h | 4 ++-
3 files changed, 63 insertions(+), 13 deletions(-)
Merging userns/for-next (139321c cifs: Enable building with user namespaces enabled.)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check)
$ git merge ktest/for-next
Already up-to-date.
Merging signal/for-next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal)
$ git merge signal/for-next
Already up-to-date.
Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry)
$ git merge clk/clk-next
Already up-to-date.
Merging random/dev (6133705 random: Mix cputime from each thread that exits to the pool)
$ git merge random/dev
Already up-to-date.
Merging lzo-update/lzo-update (0ec7382 crypto: testmgr - update LZO compression test vectors)
$ git merge lzo-update/lzo-update
Removing lib/lzo/lzo1x_decompress.c
Merge made by the 'recursive' strategy.
crypto/testmgr.h | 38 ++---
include/linux/lzo.h | 15 +-
lib/decompress_unlzo.c | 2 +-
lib/lzo/Makefile | 2 +-
lib/lzo/lzo1x_compress.c | 335 +++++++++++++++++++++++-----------------
lib/lzo/lzo1x_decompress.c | 255 ------------------------------
lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++
lib/lzo/lzodefs.h | 38 +++--
8 files changed, 488 insertions(+), 434 deletions(-)
delete mode 100644 lib/lzo/lzo1x_decompress.c
create mode 100644 lib/lzo/lzo1x_decompress_safe.c
Merging modem_shm/remoteproc-next (c68dc8d remoteproc: Always perserve resource table data)
$ git merge modem_shm/remoteproc-next
Auto-merging drivers/remoteproc/remoteproc_virtio.c
Auto-merging drivers/remoteproc/remoteproc_core.c
Merge made by the 'recursive' strategy.
drivers/remoteproc/remoteproc_core.c | 146 +++++++++++++++++------------
drivers/remoteproc/remoteproc_elf_loader.c | 96 +++++++++++++------
drivers/remoteproc/remoteproc_internal.h | 13 +++
drivers/remoteproc/remoteproc_virtio.c | 38 +++++++-
drivers/remoteproc/ste_modem_rproc.c | 50 +++++++---
include/linux/remoteproc.h | 7 +-
6 files changed, 240 insertions(+), 110 deletions(-)
Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6)
Merging akpm-current/current (6df6a56 device_cgroup: don't grab mutex in rcu callback)
$ git merge akpm-current/current
Merge made by the 'recursive' strategy.
$ 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: x86: make 'mem=' option to work for efi platform
Applying: mm: remove free_area_cache use in powerpc architecture
Applying: mm: use vm_unmapped_area() on powerpc architecture
Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress
Applying: cyber2000fb: avoid palette corruption at higher clocks
Applying: timer_list: split timer_list_show_tickdevices()
Applying: timer_list: convert timer list to be a proper seq_file
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v2-fix
Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-fix-fix
Applying: block: restore /proc/partitions to not display non-partitionable removable devices
Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs
Applying: fs: fix hang with BSD accounting on frozen filesystem
Applying: ocfs2: add freeze protection to ocfs2_file_splice_write()
Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic
Applying: mm: memmap_init_zone() performance improvement
Applying: mm: remove free_area_cache
Applying: include/linux/mmzone.h: cleanups
Applying: include-linux-mmzoneh-cleanups-fix
Applying: drop_caches: add some documentation and info message
Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev
Applying: mm/dmapool.c: fix null dev in dma_pool_create()
Applying: memcg: debugging facility to access dangling memcgs
Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix
Applying: mm: add vm event counters for balloon pages compaction
Applying: scripts-pnmtologo-fix-for-plain-pbm-checkpatch-fixes
Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq
Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock
Applying: kernel/smp.c: cleanups
Applying: MAINTAINERS: Remove Mark M. Hoffman
Applying: maintainers-remove-mark-m-hoffman-fix
Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask
Applying: epoll: support for disabling items, and a self-test app
Using index info to reconstruct a base tree...
M tools/testing/selftests/Makefile
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/Makefile
Failed to merge in the changes.
Patch failed at 0043 epoll: support for disabling items, and a self-test app
The copy of the patch that failed is found in:
/home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
$ git rebase --continue
Applying: epoll: stop comparing pointers with 0 in self-test app
Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting
Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue
Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix
Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix
Applying: rtc-ds1307-long-block-operations-bugfix-fix
Applying: arm: mvebu: add RTC support for Armada 370 and Armada XP
Applying: vfork: don't freezer_count() for in-kernel users of CLONE_VFORK
Applying: coredump: abort core dump piping only due to a fatal signal
Applying: nfsd: idr_destroy() no longer needs idr_remove_all()
Applying: ipc/sem.c: alternatives to preempt_disable()
Applying: mm: remove old aio use_mm() comment
Applying: aio: remove dead code from aio.h
Applying: gadget: remove only user of aio retry
Applying: aio: remove retry-based AIO
Applying: char: add aio_{read,write} to /dev/{null,zero}
Applying: aio: kill return value of aio_complete()
Applying: aio: add kiocb_cancel()
Applying: aio-kiocb_cancel-fix
Applying: aio: move private stuff out of aio.h
Applying: aio: dprintk() -> pr_debug()
Applying: aio: do fget() after aio_get_req()
Applying: aio: make aio_put_req() lockless
Applying: aio: refcounting cleanup
Using index info to reconstruct a base tree...
M fs/aio.c
Falling back to patching base and 3-way merge...
Auto-merging fs/aio.c
CONFLICT (content): Merge conflict in fs/aio.c
Failed to merge in the changes.
Patch failed at 0214 aio: refcounting cleanup
The copy of the patch that failed is found in:
/home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
$ git rebase --continue
Applying: wait: add wait_event_hrtimeout()
Applying: wait-add-wait_event_hrtimeout-fix
Applying: aio: make aio_read_evt() more efficient, convert to hrtimers
Applying: aio: use flush_dcache_page()
Applying: aio: use cancellation list lazily
Applying: aio-use-cancellation-list-lazily-fix
Applying: aio-use-cancellation-list-lazily-fix-fix
Applying: aio: change reqs_active to include unreaped completions
Applying: aio: kill batch allocation
Applying: aio: kill struct aio_ring_info
Applying: aio: give shared kioctx fields their own cachelines
Applying: aio-give-shared-kioctx-fields-their-own-cachelines-fix
Applying: aio: reqs_active -> reqs_available
Applying: aio: percpu reqs_available
Applying: generic dynamic per cpu refcounting
Applying: generic-dynamic-per-cpu-refcounting-fix
Applying: percpu-refcount: sparse fixes
Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix
Applying: generic-dynamic-per-cpu-refcounting-doc
Applying: generic-dynamic-per-cpu-refcounting-doc-fix
Applying: aio: percpu ioctx refcount
Using index info to reconstruct a base tree...
M fs/aio.c
Falling back to patching base and 3-way merge...
Auto-merging fs/aio.c
Applying: aio: use xchg() instead of completion_lock
Applying: aio: don't include aio.h in sched.h
Applying: aio-dont-include-aioh-in-schedh-fix
Applying: aio-dont-include-aioh-in-schedh-fix-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix
Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix
Applying: aio: kill ki_key
Applying: aio: kill ki_retry
Applying: aio-kill-ki_retry-fix
Applying: aio-kill-ki_retry-fix-fix
Applying: block, aio: batch completion for bios/kiocbs
Applying: block-aio-batch-completion-for-bios-kiocbs-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix
Applying: Fix build error due to bio_endio_batch
Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix
Applying: aio: Fix a null pointer deref in batch_complete_aio
Applying: virtio-blk: convert to batch completion
Applying: mtip32xx: convert to batch completion
Applying: aio: fix aio_read_events_ring() types
Applying: aio: document, clarify aio_read_events() and shadow_tail
Applying: aio: correct calculation of available events
Applying: aio: fix kioctx not being freed after cancellation at exit time
Applying: aio: v3: fix kioctx not being freed after cancellation at exit time
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ 5635534...985d8f9 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (cc321d5 aio: v3: fix kioctx not being freed after cancellation at exit time)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
CREDITS | 5 +
Documentation/cgroups/memory.txt | 16 +
Documentation/sysctl/vm.txt | 33 +-
MAINTAINERS | 17 +-
arch/arm/boot/dts/armada-370-xp.dtsi | 6 +
arch/arm/mm/mmap.c | 2 -
arch/arm64/mm/mmap.c | 2 -
arch/mips/mm/mmap.c | 2 -
arch/powerpc/include/asm/page_64.h | 3 +-
arch/powerpc/mm/hugetlbpage.c | 2 +-
arch/powerpc/mm/mmap_64.c | 2 -
arch/powerpc/mm/slice.c | 223 ++--
arch/powerpc/platforms/cell/spufs/file.c | 2 +-
arch/s390/hypfs/inode.c | 1 +
arch/s390/mm/mmap.c | 4 -
arch/sparc/kernel/sys_sparc_64.c | 2 -
arch/tile/mm/mmap.c | 2 -
arch/x86/ia32/ia32_aout.c | 2 -
arch/x86/include/asm/e820.h | 2 +
arch/x86/kernel/e820.c | 72 +-
arch/x86/mm/mmap.c | 2 -
arch/x86/platform/efi/efi.c | 15 +-
block/blk-core.c | 34 +-
block/blk-flush.c | 2 +-
block/blk.h | 3 +-
block/genhd.c | 2 +-
block/scsi_ioctl.c | 1 +
drivers/block/mtip32xx/mtip32xx.c | 64 +-
drivers/block/mtip32xx/mtip32xx.h | 8 +-
drivers/block/swim3.c | 2 +-
drivers/block/virtio_blk.c | 31 +-
drivers/char/mem.c | 36 +
drivers/gpu/drm/drm_fb_helper.c | 8 +
drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 +
drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
drivers/leds/leds-ot200.c | 14 +-
drivers/md/dm.c | 2 +-
drivers/rtc/rtc-ds1307.c | 60 +-
drivers/rtc/rtc-pxa.c | 64 +-
drivers/scsi/sg.c | 1 +
drivers/staging/android/logger.c | 1 +
drivers/usb/gadget/amd5536udc.c | 16 +-
drivers/usb/gadget/inode.c | 42 +-
drivers/video/cyber2000fb.c | 3 +
fs/9p/vfs_addr.c | 1 +
fs/afs/write.c | 1 +
fs/aio.c | 1788 +++++++++++---------------
fs/binfmt_aout.c | 2 -
fs/binfmt_elf.c | 23 +-
fs/bio.c | 52 +-
fs/block_dev.c | 9 +-
fs/btrfs/file.c | 4 +-
fs/btrfs/inode.c | 1 +
fs/ceph/file.c | 1 +
fs/cifs/file.c | 3 +-
fs/compat.c | 1 +
fs/coredump.c | 6 +-
fs/direct-io.c | 21 +-
fs/drop_caches.c | 2 +
fs/ecryptfs/file.c | 1 +
fs/eventpoll.c | 40 +-
fs/ext2/inode.c | 1 +
fs/ext3/inode.c | 1 +
fs/ext4/file.c | 1 +
fs/ext4/indirect.c | 1 +
fs/ext4/inode.c | 1 +
fs/ext4/page-io.c | 1 +
fs/f2fs/data.c | 1 +
fs/fat/inode.c | 1 +
fs/fuse/cuse.c | 1 +
fs/fuse/dev.c | 1 +
fs/fuse/file.c | 4 +-
fs/gfs2/aops.c | 1 +
fs/gfs2/file.c | 1 +
fs/hfs/inode.c | 1 +
fs/hfsplus/inode.c | 1 +
fs/jfs/inode.c | 1 +
fs/nfsd/nfs4state.c | 1 -
fs/nilfs2/inode.c | 2 +-
fs/ntfs/file.c | 4 +-
fs/ntfs/inode.c | 1 +
fs/ocfs2/aops.h | 2 +
fs/ocfs2/dlmglue.c | 2 +-
fs/ocfs2/file.c | 7 +-
fs/ocfs2/inode.h | 2 +
fs/pipe.c | 1 +
fs/read_write.c | 35 +-
fs/reiserfs/inode.c | 1 +
fs/splice.c | 3 +-
fs/ubifs/file.c | 1 +
fs/udf/inode.c | 1 +
fs/xfs/xfs_aops.c | 1 +
fs/xfs/xfs_file.c | 4 +-
include/linux/aio.h | 199 +--
include/linux/balloon_compaction.h | 7 +
include/linux/batch_complete.h | 23 +
include/linux/bio.h | 36 +-
include/linux/blk_types.h | 11 +-
include/linux/blkdev.h | 12 +-
include/linux/cgroup.h | 1 +
include/linux/errno.h | 1 -
include/linux/fs.h | 12 +
include/linux/hardirq.h | 5 +
include/linux/mm_types.h | 3 -
include/linux/mmzone.h | 20 +-
include/linux/percpu-refcount.h | 114 ++
include/linux/pid_namespace.h | 1 +
include/linux/rtc-pxa.h | 18 +
include/linux/sched.h | 4 -
include/linux/vm_event_item.h | 7 +-
include/linux/wait.h | 86 ++
include/linux/writeback.h | 1 +
include/uapi/linux/eventpoll.h | 1 +
init/Kconfig | 17 +
ipc/sem.c | 250 ++--
kernel/acct.c | 3 +-
kernel/fork.c | 11 +-
kernel/printk.c | 1 +
kernel/ptrace.c | 1 +
kernel/smp.c | 102 +-
kernel/time/timer_list.c | 112 +-
kernel/watchdog.c | 10 +-
lib/Makefile | 2 +-
lib/percpu-refcount.c | 243 ++++
mm/balloon_compaction.c | 2 +
mm/dmapool.c | 5 +-
mm/filemap.c | 3 +-
mm/memcontrol.c | 192 ++-
mm/migrate.c | 1 +
mm/mmap.c | 28 -
mm/mmu_context.c | 3 -
mm/nommu.c | 4 -
mm/page_alloc.c | 5 +-
mm/page_io.c | 1 +
mm/shmem.c | 1 +
mm/swap.c | 1 +
mm/util.c | 1 -
mm/vmstat.c | 9 +-
scripts/pnmtologo.c | 8 +-
security/keys/internal.h | 2 +
security/keys/keyctl.c | 1 +
sound/core/pcm_native.c | 2 +-
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/epoll/Makefile | 11 +
tools/testing/selftests/epoll/test_epoll.c | 364 ++++++
145 files changed, 2988 insertions(+), 1828 deletions(-)
create mode 100644 include/linux/batch_complete.h
create mode 100644 include/linux/percpu-refcount.h
create mode 100644 include/linux/rtc-pxa.h
create mode 100644 lib/percpu-refcount.c
create mode 100644 tools/testing/selftests/epoll/Makefile
create mode 100644 tools/testing/selftests/epoll/test_epoll.c
$ git am -3 ../patches/0001-aio-fixup-for-hlist_for_each_entry_safe-API-change.patch
Applying: aio: fixup for hlist_for_each_entry_safe API change
$ git reset HEAD^
Unstaged changes after reset:
M fs/aio.c
$ git add -A .
$ git commit -v -a --amend
[master 9c9ce51] Merge branch 'akpm/master'
|
