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
|
$ date -R
Fri, 12 May 2017 09:22:58 +1000
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at b5a53b61a289 Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Merging origin/master (09d79d103371 Merge tag 'docs-4.12-2' of git://git.lwn.net/linux)
$ git merge origin/master
Updating b5a53b61a289..09d79d103371
Fast-forward
.gitignore | 1 +
Documentation/admin-guide/README.rst | 2 +-
Documentation/admin-guide/kernel-parameters.txt | 2 +-
Documentation/arm64/tagged-pointers.txt | 62 +-
Documentation/block/bfq-iosched.txt | 17 +-
.../devicetree/bindings/display/imx/fsl,imx-fb.txt | 2 +
.../devicetree/bindings/mtd/atmel-nand.txt | 107 +-
.../devicetree/bindings/mtd/denali-nand.txt | 7 +-
.../devicetree/bindings/mtd/gpio-control-nand.txt | 4 +-
.../devicetree/bindings/mtd/stm32-quadspi.txt | 43 +
.../devicetree/bindings/rtc/cpcap-rtc.txt | 18 +
Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 +
.../devicetree/bindings/trivial-devices.txt | 1 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
Documentation/index.rst | 1 +
Documentation/input/ff.rst | 4 +-
Documentation/kbuild/makefiles.txt | 74 +-
Documentation/memory-barriers.txt | 4 +-
.../translations/ko_KR/memory-barriers.txt | 4 +-
Kbuild | 25 -
MAINTAINERS | 13 +-
Makefile | 47 +-
arch/alpha/include/uapi/asm/Kbuild | 41 -
arch/alpha/lib/Makefile | 11 +-
arch/arc/Makefile | 4 +-
arch/arc/include/uapi/asm/Kbuild | 3 -
arch/arm/Makefile | 8 +-
arch/arm/include/uapi/asm/Kbuild | 17 -
arch/arm/kernel/module.c | 11 +-
arch/arm64/Makefile | 6 +-
arch/arm64/include/asm/asm-uaccess.h | 9 +
arch/arm64/include/asm/atomic_lse.h | 4 +-
arch/arm64/include/asm/barrier.h | 20 +-
arch/arm64/include/asm/cmpxchg.h | 2 +-
arch/arm64/include/asm/uaccess.h | 13 +-
arch/arm64/include/uapi/asm/Kbuild | 18 -
arch/arm64/kernel/armv8_deprecated.c | 3 +-
arch/arm64/kernel/entry.S | 5 +-
arch/arm64/kernel/hw_breakpoint.c | 3 +
arch/arm64/kernel/module.c | 7 +-
arch/arm64/kernel/traps.c | 4 +-
arch/blackfin/include/uapi/asm/Kbuild | 17 -
arch/c6x/include/uapi/asm/Kbuild | 8 -
arch/cris/arch-v32/drivers/Kconfig | 1 -
arch/cris/include/arch-v10/arch/Kbuild | 1 -
arch/cris/include/arch-v32/arch/Kbuild | 1 -
arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 -
arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 -
arch/cris/include/uapi/asm/Kbuild | 42 -
arch/frv/include/uapi/asm/Kbuild | 33 -
arch/frv/kernel/asm-offsets.c | 19 +-
arch/h8300/include/uapi/asm/Kbuild | 28 -
arch/h8300/include/{ => uapi}/asm/bitsperlong.h | 6 +-
arch/hexagon/include/asm/Kbuild | 3 -
arch/hexagon/include/uapi/asm/Kbuild | 13 -
arch/ia64/include/uapi/asm/Kbuild | 45 -
arch/ia64/kernel/Makefile | 26 +-
arch/ia64/kernel/Makefile.gate | 2 +-
arch/m32r/include/uapi/asm/Kbuild | 31 -
arch/m68k/include/uapi/asm/Kbuild | 24 -
arch/metag/include/uapi/asm/Kbuild | 8 -
arch/microblaze/include/uapi/asm/Kbuild | 32 -
arch/mips/include/uapi/asm/Kbuild | 37 -
arch/mn10300/include/uapi/asm/Kbuild | 32 -
arch/nios2/include/uapi/asm/Kbuild | 4 +-
arch/openrisc/include/asm/Kbuild | 3 -
arch/openrisc/include/uapi/asm/Kbuild | 8 -
arch/parisc/include/uapi/asm/Kbuild | 28 -
arch/powerpc/include/uapi/asm/Kbuild | 45 -
arch/s390/include/uapi/asm/Kbuild | 46 -
arch/score/include/asm/Kbuild | 3 -
arch/score/include/uapi/asm/Kbuild | 32 -
arch/sh/Makefile | 7 +-
arch/sh/include/uapi/asm/Kbuild | 23 -
arch/sparc/include/uapi/asm/Kbuild | 48 -
arch/tile/include/arch/Kbuild | 1 -
arch/tile/include/asm/Kbuild | 3 -
arch/tile/include/uapi/arch/Kbuild | 17 -
arch/tile/include/uapi/asm/Kbuild | 17 -
arch/unicore32/Makefile | 4 +-
arch/unicore32/include/uapi/asm/Kbuild | 6 -
arch/x86/include/uapi/asm/Kbuild | 59 -
arch/x86/kernel/i8259.c | 1 +
arch/x86/mm/testmmiotrace.c | 2 +-
arch/xtensa/include/uapi/asm/Kbuild | 23 -
block/bfq-iosched.c | 5 +
block/bfq-wf2q.c | 13 +-
block/blk-core.c | 24 +-
block/blk-mq.c | 10 +-
block/blk-stat.c | 17 +-
block/elevator.c | 5 +-
drivers/char/applicom.c | 4 +-
drivers/char/ipmi/ipmi_si_intf.c | 14 +-
drivers/char/mwave/mwavedd.c | 8 +-
drivers/clocksource/cs5535-clockevt.c | 2 +-
drivers/cpufreq/speedstep-smi.c | 2 +-
drivers/gpio/gpio-104-dio-48e.c | 4 +-
drivers/gpio/gpio-104-idi-48.c | 4 +-
drivers/gpio/gpio-104-idio-16.c | 4 +-
drivers/gpio/gpio-gpio-mm.c | 2 +-
drivers/gpio/gpio-ws16c48.c | 4 +-
drivers/i2c/busses/i2c-ali15x3.c | 2 +-
drivers/i2c/busses/i2c-elektor.c | 6 +-
drivers/i2c/busses/i2c-parport-light.c | 4 +-
drivers/i2c/busses/i2c-pca-isa.c | 4 +-
drivers/i2c/busses/i2c-piix4.c | 2 +-
drivers/i2c/busses/i2c-sis5595.c | 2 +-
drivers/i2c/busses/i2c-viapro.c | 2 +-
drivers/i2c/busses/scx200_acb.c | 2 +-
drivers/iio/adc/stx104.c | 2 +-
drivers/iio/dac/cio-dac.c | 2 +-
drivers/input/mouse/inport.c | 2 +-
drivers/input/mouse/logibm.c | 2 +-
drivers/input/touchscreen/mk712.c | 4 +-
drivers/isdn/hardware/avm/b1isa.c | 4 +-
drivers/isdn/hardware/avm/t1isa.c | 4 +-
drivers/isdn/hisax/config.c | 10 +-
drivers/media/pci/zoran/zoran_card.c | 2 +-
drivers/media/rc/serial_ir.c | 10 +-
drivers/memory/Kconfig | 2 +-
drivers/misc/dummy-irq.c | 2 +-
drivers/mmc/host/wbsd.c | 8 +-
drivers/mtd/chips/cfi_cmdset_0002.c | 12 +-
drivers/mtd/maps/Makefile | 10 +-
.../mtd/maps/{physmap_of.c => physmap_of_core.c} | 30 +-
drivers/mtd/mtdswap.c | 6 +-
drivers/mtd/nand/Kconfig | 23 +-
drivers/mtd/nand/Makefile | 11 +-
drivers/mtd/nand/atmel/Makefile | 4 +
drivers/mtd/nand/atmel/nand-controller.c | 2197 +++++++++++++++++
drivers/mtd/nand/atmel/pmecc.c | 1020 ++++++++
drivers/mtd/nand/atmel/pmecc.h | 73 +
drivers/mtd/nand/atmel_nand.c | 2479 --------------------
drivers/mtd/nand/atmel_nand_ecc.h | 163 --
drivers/mtd/nand/atmel_nand_nfc.h | 103 -
drivers/mtd/nand/brcmnand/brcmnand.c | 61 +-
drivers/mtd/nand/cmx270_nand.c | 4 +-
drivers/mtd/nand/davinci_nand.c | 11 +
drivers/mtd/nand/denali.c | 567 +++--
drivers/mtd/nand/denali.h | 192 +-
drivers/mtd/nand/denali_dt.c | 74 +-
drivers/mtd/nand/fsmc_nand.c | 236 +-
drivers/mtd/nand/gpio.c | 18 +-
drivers/mtd/nand/nand_amd.c | 51 +
drivers/mtd/nand/nand_base.c | 588 +++--
drivers/mtd/nand/nand_hynix.c | 631 +++++
drivers/mtd/nand/nand_ids.c | 39 +-
drivers/mtd/nand/nand_macronix.c | 30 +
drivers/mtd/nand/nand_micron.c | 86 +
drivers/mtd/nand/nand_samsung.c | 112 +
drivers/mtd/nand/nand_toshiba.c | 51 +
drivers/mtd/nand/nandsim.c | 2 +-
drivers/mtd/nand/omap2.c | 9 +
drivers/mtd/nand/orion_nand.c | 48 +-
drivers/mtd/nand/oxnas_nand.c | 2 +-
drivers/mtd/nand/sunxi_nand.c | 20 +-
drivers/mtd/nand/tango_nand.c | 8 +-
drivers/mtd/ofpart.c | 4 +-
drivers/mtd/spi-nor/Kconfig | 7 +
drivers/mtd/spi-nor/Makefile | 1 +
drivers/mtd/spi-nor/hisi-sfc.c | 5 +-
drivers/mtd/spi-nor/intel-spi.c | 4 +-
drivers/mtd/spi-nor/mtk-quadspi.c | 27 +
drivers/mtd/spi-nor/spi-nor.c | 18 +-
drivers/mtd/spi-nor/stm32-quadspi.c | 693 ++++++
drivers/net/appletalk/cops.c | 6 +-
drivers/net/appletalk/ltpc.c | 6 +-
drivers/net/arcnet/com20020-isa.c | 4 +-
drivers/net/arcnet/com90io.c | 4 +-
drivers/net/arcnet/com90xx.c | 4 +-
drivers/net/can/cc770/cc770_isa.c | 8 +-
drivers/net/can/sja1000/sja1000_isa.c | 8 +-
drivers/net/ethernet/3com/3c509.c | 2 +-
drivers/net/ethernet/3com/3c59x.c | 4 +-
drivers/net/ethernet/8390/ne.c | 4 +-
drivers/net/ethernet/8390/smc-ultra.c | 4 +-
drivers/net/ethernet/8390/wd.c | 8 +-
drivers/net/ethernet/amd/lance.c | 6 +-
drivers/net/ethernet/amd/ni65.c | 6 +-
drivers/net/ethernet/cirrus/cs89x0.c | 6 +-
drivers/net/ethernet/dec/tulip/de4x5.c | 2 +-
drivers/net/ethernet/hp/hp100.c | 2 +-
drivers/net/ethernet/realtek/atp.c | 4 +-
drivers/net/ethernet/smsc/smc9194.c | 4 +-
drivers/net/hamradio/baycom_epp.c | 2 +-
drivers/net/hamradio/baycom_par.c | 2 +-
drivers/net/hamradio/baycom_ser_fdx.c | 4 +-
drivers/net/hamradio/baycom_ser_hdx.c | 4 +-
drivers/net/hamradio/dmascc.c | 2 +-
drivers/net/irda/ali-ircc.c | 6 +-
drivers/net/irda/nsc-ircc.c | 6 +-
drivers/net/irda/smsc-ircc2.c | 10 +-
drivers/net/irda/w83977af_ir.c | 4 +-
drivers/net/wan/cosa.c | 6 +-
drivers/net/wan/hostess_sv11.c | 6 +-
drivers/net/wan/sbni.c | 4 +-
drivers/net/wan/sealevel.c | 8 +-
drivers/net/wireless/cisco/airo.c | 4 +-
drivers/nvme/host/lightnvm.c | 9 +-
drivers/parport/parport_pc.c | 8 +-
drivers/pci/hotplug/cpcihp_generic.c | 2 +-
drivers/pcmcia/i82365.c | 8 +-
drivers/pcmcia/tcic.c | 8 +-
drivers/rtc/Kconfig | 11 +-
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-bq32k.c | 7 +
drivers/rtc/rtc-cmos.c | 17 +-
drivers/rtc/rtc-cpcap.c | 330 +++
drivers/rtc/rtc-ds1307.c | 85 +-
drivers/rtc/rtc-ds1374.c | 11 +-
drivers/rtc/rtc-ds1672.c | 9 +-
drivers/rtc/rtc-ds3232.c | 7 +
drivers/rtc/rtc-gemini.c | 2 +
drivers/rtc/rtc-hid-sensor-time.c | 4 +-
drivers/rtc/rtc-isl1208.c | 12 +-
drivers/rtc/rtc-m41t80.c | 68 +-
drivers/rtc/rtc-omap.c | 22 +-
drivers/rtc/rtc-rs5c372.c | 37 +-
drivers/rtc/rtc-rv3029c2.c | 9 +
drivers/rtc/rtc-rv8803.c | 21 +-
drivers/rtc/rtc-rx8010.c | 7 +
drivers/rtc/rtc-rx8581.c | 7 +
drivers/rtc/rtc-s35390a.c | 8 +
drivers/rtc/rtc-sh.c | 39 +-
drivers/rtc/rtc-snvs.c | 2 +-
drivers/rtc/rtc-wm8350.c | 2 -
drivers/scsi/aha152x.c | 4 +-
drivers/scsi/aha1542.c | 2 +-
drivers/scsi/g_NCR5380.c | 8 +-
drivers/scsi/gdth.c | 2 +-
drivers/scsi/qlogicfas.c | 4 +-
drivers/staging/speakup/speakup_acntpc.c | 2 +-
drivers/staging/speakup/speakup_dtlk.c | 2 +-
drivers/staging/speakup/speakup_keypc.c | 2 +-
drivers/staging/vme/devices/vme_pio2_core.c | 8 +-
drivers/tty/cyclades.c | 4 +-
drivers/tty/moxa.c | 2 +-
drivers/tty/mxser.c | 2 +-
drivers/tty/rocket.c | 10 +-
drivers/tty/serial/8250/8250_core.c | 4 +-
drivers/tty/synclink.c | 6 +-
drivers/video/Makefile | 1 +
drivers/video/console/Kconfig | 2 +-
drivers/video/fbdev/Kconfig | 2 -
drivers/video/fbdev/acornfb.c | 12 +-
drivers/video/fbdev/amba-clcd.c | 4 +-
drivers/video/fbdev/arcfb.c | 8 +-
drivers/video/fbdev/aty/radeon_base.c | 4 +-
drivers/video/fbdev/core/fbmon.c | 4 +-
drivers/video/fbdev/i810/i810_main.c | 6 +-
drivers/video/fbdev/imxfb.c | 17 +
drivers/video/fbdev/n411.c | 6 +-
drivers/video/fbdev/omap/lcd_mipid.c | 2 +-
drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +-
drivers/video/fbdev/pmag-aa-fb.c | 4 +-
drivers/video/fbdev/pmag-ba-fb.c | 4 +-
drivers/video/fbdev/pmagb-b-fb.c | 4 +-
drivers/video/fbdev/pxafb.c | 7 +-
drivers/video/fbdev/sm501fb.c | 1 +
drivers/video/fbdev/udlfb.c | 14 +-
drivers/video/fbdev/xen-fbfront.c | 10 +
drivers/video/logo/logo.c | 2 +-
drivers/watchdog/cpu5wdt.c | 2 +-
drivers/watchdog/eurotechwdt.c | 4 +-
drivers/watchdog/pc87413_wdt.c | 2 +-
drivers/watchdog/sc1200wdt.c | 2 +-
drivers/watchdog/wdt.c | 4 +-
fs/jffs2/readinode.c | 2 +-
fs/pstore/ram.c | 2 +-
include/Kbuild | 2 -
include/asm-generic/Kbuild.asm | 1 -
include/linux/kbuild.h | 6 +-
include/linux/moduleparam.h | 65 +-
include/linux/mtd/mtd.h | 2 +-
include/linux/mtd/nand.h | 96 +-
include/linux/platform_data/video-imxfb.h | 1 +
include/rdma/ib_verbs.h | 3 +-
include/scsi/fc/Kbuild | 0
include/uapi/Kbuild | 15 -
include/uapi/asm-generic/Kbuild | 36 -
include/uapi/asm-generic/Kbuild.asm | 76 +-
include/uapi/drm/Kbuild | 23 -
include/uapi/linux/Kbuild | 494 +---
include/uapi/linux/android/Kbuild | 2 -
include/uapi/linux/bcache.h | 2 +-
include/uapi/linux/btrfs_tree.h | 3 +
include/uapi/linux/byteorder/Kbuild | 3 -
include/uapi/linux/caif/Kbuild | 3 -
include/uapi/linux/can/Kbuild | 6 -
include/uapi/linux/cryptouser.h | 2 +
include/uapi/linux/dvb/Kbuild | 9 -
include/uapi/linux/hdlc/Kbuild | 2 -
include/uapi/linux/hsi/Kbuild | 2 -
include/uapi/linux/iio/Kbuild | 3 -
include/uapi/linux/isdn/Kbuild | 2 -
include/uapi/linux/mmc/Kbuild | 2 -
include/uapi/linux/netfilter/Kbuild | 89 -
include/uapi/linux/netfilter/ipset/Kbuild | 5 -
include/uapi/linux/netfilter_arp/Kbuild | 3 -
include/uapi/linux/netfilter_bridge/Kbuild | 18 -
include/uapi/linux/netfilter_ipv4/Kbuild | 10 -
include/uapi/linux/netfilter_ipv6/Kbuild | 13 -
include/uapi/linux/nfsd/Kbuild | 6 -
include/uapi/linux/pr.h | 2 +
include/uapi/linux/qrtr.h | 1 +
include/uapi/linux/raid/Kbuild | 3 -
include/uapi/linux/smc_diag.h | 2 +-
include/uapi/linux/spi/Kbuild | 2 -
include/uapi/linux/sunrpc/Kbuild | 2 -
include/uapi/linux/tc_act/Kbuild | 16 -
include/uapi/linux/tc_ematch/Kbuild | 5 -
include/uapi/linux/usb/Kbuild | 12 -
include/uapi/linux/wimax/Kbuild | 2 -
include/uapi/misc/Kbuild | 2 -
include/uapi/mtd/Kbuild | 6 -
include/uapi/rdma/Kbuild | 20 -
include/uapi/rdma/bnxt_re-abi.h | 2 +
include/uapi/rdma/hfi/Kbuild | 3 -
include/uapi/rdma/ib_user_verbs.h | 2 +
include/uapi/scsi/Kbuild | 6 -
include/uapi/scsi/fc/Kbuild | 5 -
include/uapi/sound/Kbuild | 16 -
include/uapi/video/Kbuild | 4 -
include/uapi/xen/Kbuild | 5 -
include/video/Kbuild | 0
mm/vmalloc.c | 2 +-
scripts/Kbuild.include | 6 +-
scripts/Makefile.build | 12 +-
scripts/Makefile.dtbinst | 8 -
scripts/Makefile.extrawarn | 1 -
scripts/Makefile.headersinst | 68 +-
scripts/Makefile.lib | 31 +
scripts/genksyms/parse.tab.c_shipped | 474 ++--
scripts/genksyms/parse.y | 2 -
scripts/mod/Makefile | 28 +-
scripts/objdiff | 5 +-
scripts/package/builddeb | 16 +-
sound/drivers/mpu401/mpu401.c | 4 +-
sound/drivers/mtpav.c | 4 +-
sound/drivers/serial-u16550.c | 4 +-
sound/isa/ad1848/ad1848.c | 6 +-
sound/isa/adlib.c | 2 +-
sound/isa/cmi8328.c | 12 +-
sound/isa/cmi8330.c | 20 +-
sound/isa/cs423x/cs4231.c | 12 +-
sound/isa/cs423x/cs4236.c | 18 +-
sound/isa/es1688/es1688.c | 12 +-
sound/isa/es18xx.c | 12 +-
sound/isa/galaxy/galaxy.c | 16 +-
sound/isa/gus/gusclassic.c | 8 +-
sound/isa/gus/gusextreme.c | 16 +-
sound/isa/gus/gusmax.c | 8 +-
sound/isa/gus/interwave.c | 10 +-
sound/isa/msnd/msnd_pinnacle.c | 20 +-
sound/isa/opl3sa2.c | 16 +-
sound/isa/opti9xx/miro.c | 14 +-
sound/isa/opti9xx/opti92x-ad1848.c | 14 +-
sound/isa/sb/jazz16.c | 12 +-
sound/isa/sb/sb16.c | 14 +-
sound/isa/sb/sb8.c | 6 +-
sound/isa/sc6000.c | 12 +-
sound/isa/sscape.c | 12 +-
sound/isa/wavefront/wavefront.c | 18 +-
sound/oss/ad1848.c | 8 +-
sound/oss/aedsp16.c | 12 +-
sound/oss/mpu401.c | 4 +-
sound/oss/msnd_pinnacle.c | 20 +-
sound/oss/opl3.c | 2 +-
sound/oss/pas2_card.c | 18 +-
sound/oss/pss.c | 14 +-
sound/oss/sb_card.c | 10 +-
sound/oss/trix.c | 18 +-
sound/oss/uart401.c | 4 +-
sound/oss/uart6850.c | 4 +-
sound/oss/waveartist.c | 8 +-
sound/pci/als4000.c | 2 +-
sound/pci/cmipci.c | 6 +-
sound/pci/ens1370.c | 2 +-
sound/pci/riptide/riptide.c | 6 +-
sound/pci/sonicvibes.c | 2 +-
sound/pci/via82xx.c | 2 +-
sound/pci/ymfpci/ymfpci.c | 6 +-
382 files changed, 8112 insertions(+), 6620 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mtd/stm32-quadspi.txt
create mode 100644 Documentation/devicetree/bindings/rtc/cpcap-rtc.txt
create mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt
delete mode 100644 arch/cris/include/arch-v10/arch/Kbuild
delete mode 100644 arch/cris/include/arch-v32/arch/Kbuild
delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild
delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild
rename arch/h8300/include/{ => uapi}/asm/bitsperlong.h (67%)
delete mode 100644 arch/tile/include/arch/Kbuild
delete mode 100644 arch/tile/include/uapi/arch/Kbuild
rename drivers/mtd/maps/{physmap_of.c => physmap_of_core.c} (96%)
create mode 100644 drivers/mtd/nand/atmel/Makefile
create mode 100644 drivers/mtd/nand/atmel/nand-controller.c
create mode 100644 drivers/mtd/nand/atmel/pmecc.c
create mode 100644 drivers/mtd/nand/atmel/pmecc.h
delete mode 100644 drivers/mtd/nand/atmel_nand.c
delete mode 100644 drivers/mtd/nand/atmel_nand_ecc.h
delete mode 100644 drivers/mtd/nand/atmel_nand_nfc.h
create mode 100644 drivers/mtd/nand/nand_amd.c
create mode 100644 drivers/mtd/nand/nand_hynix.c
create mode 100644 drivers/mtd/nand/nand_macronix.c
create mode 100644 drivers/mtd/nand/nand_micron.c
create mode 100644 drivers/mtd/nand/nand_samsung.c
create mode 100644 drivers/mtd/nand/nand_toshiba.c
create mode 100644 drivers/mtd/spi-nor/stm32-quadspi.c
create mode 100644 drivers/rtc/rtc-cpcap.c
delete mode 100644 include/Kbuild
delete mode 100644 include/asm-generic/Kbuild.asm
delete mode 100644 include/scsi/fc/Kbuild
delete mode 100644 include/uapi/Kbuild
delete mode 100644 include/uapi/asm-generic/Kbuild
delete mode 100644 include/uapi/drm/Kbuild
delete mode 100644 include/uapi/linux/android/Kbuild
delete mode 100644 include/uapi/linux/byteorder/Kbuild
delete mode 100644 include/uapi/linux/caif/Kbuild
delete mode 100644 include/uapi/linux/can/Kbuild
delete mode 100644 include/uapi/linux/dvb/Kbuild
delete mode 100644 include/uapi/linux/hdlc/Kbuild
delete mode 100644 include/uapi/linux/hsi/Kbuild
delete mode 100644 include/uapi/linux/iio/Kbuild
delete mode 100644 include/uapi/linux/isdn/Kbuild
delete mode 100644 include/uapi/linux/mmc/Kbuild
delete mode 100644 include/uapi/linux/netfilter/Kbuild
delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild
delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild
delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild
delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild
delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild
delete mode 100644 include/uapi/linux/nfsd/Kbuild
delete mode 100644 include/uapi/linux/raid/Kbuild
delete mode 100644 include/uapi/linux/spi/Kbuild
delete mode 100644 include/uapi/linux/sunrpc/Kbuild
delete mode 100644 include/uapi/linux/tc_act/Kbuild
delete mode 100644 include/uapi/linux/tc_ematch/Kbuild
delete mode 100644 include/uapi/linux/usb/Kbuild
delete mode 100644 include/uapi/linux/wimax/Kbuild
delete mode 100644 include/uapi/misc/Kbuild
delete mode 100644 include/uapi/mtd/Kbuild
delete mode 100644 include/uapi/rdma/Kbuild
delete mode 100644 include/uapi/rdma/hfi/Kbuild
delete mode 100644 include/uapi/scsi/Kbuild
delete mode 100644 include/uapi/scsi/fc/Kbuild
delete mode 100644 include/uapi/sound/Kbuild
delete mode 100644 include/uapi/video/Kbuild
delete mode 100644 include/uapi/xen/Kbuild
delete mode 100644 include/video/Kbuild
Merging fixes/master (97da3854c526 Linux 4.11-rc3)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition)
$ git merge kbuild-current/fixes
Already up-to-date.
Merging arc-current/for-curr (cf4100d1cddc Revert "ARCv2: Allow enabling PAE40 w/o HIGHMEM")
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (6d8059493691 ARM: 8670/1: V7M: Do not corrupt vector table around v7m_invalidate_l1 call)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (be5c5e843c4a powerpc/64: Fix HMI exception on LE with CONFIG_RELOCATABLE=y)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging sparc/master (3c7f62212018 sparc64: fix fault handling in NGbzero.S and GENbzero.S)
$ git merge sparc/master
Already up-to-date.
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
$ git merge fscrypt-current/for-stable
Already up-to-date.
Merging net/master (228b0324fe61 Merge branch 'bpf-pkt-ptr-align')
$ git merge net/master
Auto-merging net/ipv6/tcp_ipv6.c
Auto-merging net/dccp/ipv6.c
Merge made by the 'recursive' strategy.
arch/arm64/net/bpf_jit_comp.c | 5 +-
.../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 10 +-
drivers/net/ethernet/ti/netcp_core.c | 6 +-
drivers/net/phy/mdio-mux.c | 12 +-
drivers/net/vrf.c | 3 +-
drivers/s390/net/qeth_core.h | 4 +
drivers/s390/net/qeth_core_main.c | 21 +-
drivers/s390/net/qeth_core_sys.c | 24 +-
drivers/s390/net/qeth_l2.h | 2 +
drivers/s390/net/qeth_l2_main.c | 26 +-
drivers/s390/net/qeth_l2_sys.c | 8 +
drivers/s390/net/qeth_l3_main.c | 8 +-
drivers/soc/ti/knav_dma.c | 2 +-
include/linux/bpf_verifier.h | 4 +
include/uapi/linux/bpf.h | 8 +
kernel/bpf/syscall.c | 5 +-
kernel/bpf/verifier.c | 133 +++++--
net/dccp/ipv6.c | 6 +
net/ipv6/tcp_ipv6.c | 2 +
tools/build/feature/test-bpf.c | 1 +
tools/include/uapi/linux/bpf.h | 11 +-
tools/lib/bpf/bpf.c | 22 ++
tools/lib/bpf/bpf.h | 4 +
tools/testing/selftests/bpf/Makefile | 3 +-
tools/testing/selftests/bpf/test_align.c | 417 +++++++++++++++++++++
26 files changed, 681 insertions(+), 68 deletions(-)
create mode 100644 tools/testing/selftests/bpf/test_align.c
Merging ipsec/master (2c1497bbc8fd xfrm: Fix NETDEV_DOWN with IPSec offload)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
include/net/xfrm.h | 10 ----------
net/ipv4/esp4.c | 5 ++++-
net/key/af_key.c | 2 +-
net/xfrm/xfrm_device.c | 2 +-
net/xfrm/xfrm_policy.c | 47 -----------------------------------------------
5 files changed, 6 insertions(+), 60 deletions(-)
Merging netfilter/master (f411af682218 Merge branch 'ibmvnic-Updated-reset-handler-andcode-fixes')
$ git merge netfilter/master
Already up-to-date.
Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections)
$ git merge ipvs/master
Merge made by the 'recursive' strategy.
net/netfilter/ipvs/ip_vs_core.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface)
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (29cee56c0be4 Merge tag 'mac80211-for-davem-2017-05-08' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211)
$ git merge mac80211/master
Already up-to-date.
Merging sound-current/for-linus (3488df131df9 sound: Disable the build of OSS drivers)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
sound/Kconfig | 3 ++-
sound/hda/hdac_controller.c | 4 ++++
sound/pci/hda/patch_conexant.c | 4 +++-
3 files changed, 9 insertions(+), 2 deletions(-)
Merging pci-current/for-linus (b9c1153f7a9c PCI: hisi: Fix DT binding (hisi-pcie-almost-ecam))
$ git merge pci-current/for-linus
Already up-to-date.
Merging driver-core.current/driver-core-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (4f7d029b9bf0 Linux 4.11-rc7)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (a71c9a1c779f Linux 4.11-rc5)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (a351e9b9fc24 Linux 4.11)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON)
$ git merge phy/fixes
Already up-to-date.
Merging staging.current/staging-linus (56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (8be193c7b1f4 Input: add support for PlayStation 1/2 joypads connected via SPI)
$ git merge input-current/for-linus
Merge made by the 'recursive' strategy.
drivers/input/joystick/Kconfig | 21 ++
drivers/input/joystick/Makefile | 1 +
drivers/input/joystick/psxpad-spi.c | 401 ++++++++++++++++++++++++++++++++++++
drivers/input/joystick/xpad.c | 27 ++-
4 files changed, 444 insertions(+), 6 deletions(-)
create mode 100644 drivers/input/joystick/psxpad-spi.c
Merging crypto-current/master (929562b14478 crypto: stm32 - Fix OF module alias information)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination)
$ git merge ide/master
Already up-to-date.
Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-rc1)
$ git merge kselftest-fixes/fixes
Already up-to-date.
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
$ git merge backlight-fixes/for-backlight-fixes
Already up-to-date.
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
$ git merge ftrace-fixes/for-next-urgent
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (b2376407f989 mfd: cros-ec: Fix host command buffer size)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats)
$ git merge v4l-dvb-fixes/fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (a351e9b9fc24 Linux 4.11)
$ git merge drm-intel-fixes/for-linux-next-fixes
Already up-to-date.
Merging drm-misc-fixes/for-linux-next-fixes (0c45b36f8acc drm/udl: Fix unaligned memory access in udl_render_hline)
$ git merge drm-misc-fixes/for-linux-next-fixes
Already up-to-date.
Merging kbuild/for-next (791a9a666d1a Merge tag 'kbuild-uapi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild)
$ git merge kbuild/for-next
Already up-to-date.
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
$ git merge asm-generic/master
Resolved 'include/asm-generic/percpu.h' using previous resolution.
Auto-merging include/asm-generic/percpu.h
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 27fd0e08be22] Merge remote-tracking branch 'asm-generic/master'
$ git diff -M --stat --summary HEAD^..
include/asm-generic/page.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (c92a90a5060a Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Already up-to-date.
Merging arm-perf/for-next/perf (f00fa5f4163b arm64: pmuv3: use arm_pmu ACPI framework)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (e3ec06d4bc1e arm-soc: document merges)
$ git merge arm-soc/for-next
Resolved 'drivers/tee/tee_shm.c' using previous resolution.
Auto-merging drivers/tee/tee_shm.c
CONFLICT (content): Merge conflict in drivers/tee/tee_shm.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2b1826cc833e] Merge remote-tracking branch 'arm-soc/for-next'
$ git diff -M --stat --summary HEAD^..
arch/arm/arm-soc-for-next-contents.txt | 15 ++++++
arch/arm/boot/dts/mt7623.dtsi | 2 +
arch/arm/mach-omap2/common.h | 3 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 10 ++--
arch/arm/mach-omap2/omap-smp.c | 11 ++--
arch/arm64/Kconfig.platforms | 5 ++
arch/arm64/boot/dts/marvell/armada-3720-db.dts | 8 +++
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 73 ++++++++++++++++++++++++--
arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 3 ++
include/linux/soc/renesas/rcar-rst.h | 5 ++
10 files changed, 122 insertions(+), 13 deletions(-)
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values)
$ git merge alpine/alpine/for-next
Merge made by the 'recursive' strategy.
Merging amlogic/for-next (715dcd206041 Merge branch 'v4.12/drivers' into tmp/aml-rebuild)
$ git merge amlogic/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next)
$ git merge aspeed/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging at91/at91-next (ce60fdaa7e9e Merge remote-tracking branch 'alex_korg/at91-dt' into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
Merging bcm2835/for-next (7ea6e490ba7f Merge branch anholt/bcm2835-defconfig-64-next into for-next)
$ git merge bcm2835/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (990df0480610 Merge branch 'zte/dt64' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging keystone/next (4495c08e8472 Linux 4.11-rc2)
$ git merge keystone/next
Already up-to-date.
Merging mvebu/for-next (4cfb1f480e35 Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging omap/for-next (5a0bbcf7ab0f Merge branch 'omap-for-v4.12/defconfig' into for-next)
$ git merge omap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
$ git merge omap-pending/for-next
Already up-to-date.
Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12)
$ git merge qcom/for-next
Merge made by the 'recursive' strategy.
Merging renesas/next (c8906b237adf Merge branch 'fixes-for-v4.12' into next)
$ git merge renesas/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging rockchip/for-next (b1e842489772 Merge branch 'v4.12-armsoc/dts64' into for-next)
$ git merge rockchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (725bbcc7945c Merge branch 'fixes' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 1 -
1 file changed, 1 deletion(-)
Merging sunxi/sunxi/for-next (5675caea945d Merge branches 'sunxi/clk-for-4.12', 'sunxi/dt-for-4.12' and 'sunxi/fixes-for-4.11' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
Merging tegra/for-next (29d04525797f Merge branch for-4.12/clk into for-next)
$ git merge tegra/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging arm64/for-next/core (0c2cf6d9487c arm64: Silence first allocation with CONFIG_ARM64_MODULE_PLTS=y)
$ git merge arm64/for-next/core
Already up-to-date.
Merging clk/clk-next (0119dc6132d2 clk: x86: pmc-atom: Checking for IS_ERR() instead of NULL)
$ git merge clk/clk-next
Already up-to-date.
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (f6ab4d59a5fe nubus: Add MVC and VSC video card definitions)
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (99a2c395541f m68k/coldfire/pit: set ->min_delta_ticks and ->max_delta_ticks)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (b153c82756e9 Merge branch '4.11-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Resolved 'arch/mips/Kconfig' using previous resolution.
Auto-merging drivers/irqchip/Kconfig
Auto-merging arch/mips/mm/init.c
Auto-merging arch/mips/kernel/perf_event_mipsxx.c
Auto-merging arch/mips/kernel/mips-r2-to-r6-emul.c
Auto-merging arch/mips/kernel/cpu-probe.c
Removing arch/mips/include/asm/octeon/cvmx-l2d-defs.h
Auto-merging arch/mips/include/asm/cpu-info.h
Auto-merging arch/mips/Kconfig
CONFLICT (content): Merge conflict in arch/mips/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 21ab45af6349] Merge remote-tracking branch 'mips/mips-for-linux-next'
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 2 +-
arch/mips/Kbuild | 2 +
arch/mips/Kconfig | 24 +-
arch/mips/Kconfig.debug | 2 +-
arch/mips/cavium-octeon/Kconfig | 9 -
arch/mips/cavium-octeon/Platform | 4 -
arch/mips/cavium-octeon/executive/cvmx-l2c.c | 139 +-
arch/mips/cavium-octeon/executive/octeon-model.c | 21 +-
arch/mips/cavium-octeon/octeon-platform.c | 113 +-
arch/mips/cavium-octeon/setup.c | 12 +-
arch/mips/configs/generic_defconfig | 3 +
arch/mips/include/asm/cache.h | 5 -
arch/mips/include/asm/cpu-info.h | 3 +-
arch/mips/include/asm/cpufeature.h | 26 +
arch/mips/include/asm/highmem.h | 5 +
.../include/asm/mach-rm/cpu-feature-overrides.h | 2 -
arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 3193 +-----------------
arch/mips/include/asm/octeon/cvmx-l2c.h | 59 +-
arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 526 ---
arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 286 +-
arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 3225 ++----------------
arch/mips/include/asm/octeon/cvmx-sli-defs.h | 3541 +-------------------
arch/mips/include/asm/octeon/cvmx.h | 3 +-
arch/mips/include/asm/pgalloc.h | 26 +
arch/mips/include/asm/pgtable-32.h | 7 +-
arch/mips/include/asm/pgtable-64.h | 88 +-
arch/mips/include/asm/uasm.h | 88 +-
arch/mips/kernel/cpu-probe.c | 7 +
arch/mips/kernel/mips-r2-to-r6-emul.c | 16 +-
arch/mips/kernel/perf_event_mipsxx.c | 6 +-
arch/mips/kernel/process.c | 6 +-
arch/mips/kernel/r4k_switch.S | 6 -
arch/mips/kernel/smp-cps.c | 7 +-
arch/mips/kernel/smp-mt.c | 49 +-
arch/mips/kernel/smp.c | 20 +-
arch/mips/lantiq/irq.c | 52 -
arch/mips/math-emu/cp1emu.c | 10 +-
arch/mips/mm/fault.c | 16 +-
arch/mips/mm/init.c | 3 +
arch/mips/mm/pgtable-32.c | 6 +-
arch/mips/mm/pgtable-64.c | 33 +-
arch/mips/mm/tlbex.c | 22 +
arch/mips/mm/uasm-mips.c | 1 +
arch/mips/mm/uasm.c | 159 +-
arch/mips/mti-malta/malta-int.c | 83 +-
arch/mips/net/bpf_jit.c | 41 +-
arch/mips/net/bpf_jit_asm.S | 23 +-
arch/mips/pci/pcie-octeon.c | 4 +-
arch/mips/sibyte/bcm1480/setup.c | 1 +
arch/mips/sibyte/sb1250/setup.c | 1 +
drivers/cpufreq/loongson2_cpufreq.c | 7 -
drivers/irqchip/Kconfig | 2 +
drivers/irqchip/irq-mips-cpu.c | 146 +-
drivers/net/ethernet/broadcom/sb1250-mac.c | 1 +
54 files changed, 1228 insertions(+), 10914 deletions(-)
create mode 100644 arch/mips/include/asm/cpufeature.h
delete mode 100644 arch/mips/include/asm/octeon/cvmx-l2d-defs.h
Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation)
$ git merge nios2/for-next
Removing arch/nios2/kernel/early_printk.c
Removing arch/nios2/include/asm/prom.h
Removing arch/nios2/include/asm/cmpxchg.h
Merge made by the 'recursive' strategy.
arch/nios2/Kconfig | 2 +
arch/nios2/Kconfig.debug | 1 -
arch/nios2/Makefile | 5 ++
arch/nios2/boot/.gitignore | 2 +
arch/nios2/boot/dts/10m50_devboard.dts | 3 +-
arch/nios2/include/asm/Kbuild | 1 +
arch/nios2/include/asm/cacheflush.h | 6 +-
arch/nios2/include/asm/cmpxchg.h | 14 ----
arch/nios2/include/asm/cpuinfo.h | 2 +
arch/nios2/include/asm/prom.h | 22 ------
arch/nios2/include/asm/setup.h | 2 -
arch/nios2/include/asm/uaccess.h | 7 +-
arch/nios2/kernel/.gitignore | 1 +
arch/nios2/kernel/Makefile | 1 -
arch/nios2/kernel/cpuinfo.c | 18 ++++-
arch/nios2/kernel/early_printk.c | 118 ---------------------------------
arch/nios2/kernel/irq.c | 2 +-
arch/nios2/kernel/prom.c | 49 --------------
arch/nios2/kernel/setup.c | 6 +-
arch/nios2/mm/uaccess.c | 33 ---------
arch/nios2/platform/Kconfig.platform | 26 ++++++++
21 files changed, 69 insertions(+), 252 deletions(-)
create mode 100644 arch/nios2/boot/.gitignore
delete mode 100644 arch/nios2/include/asm/cmpxchg.h
delete mode 100644 arch/nios2/include/asm/prom.h
create mode 100644 arch/nios2/kernel/.gitignore
delete mode 100644 arch/nios2/kernel/early_printk.c
Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start)
$ git merge openrisc/for-next
Already up-to-date.
Merging parisc-hd/for-next (c83f6fd500ed parisc: Add Page Deallocation Table (PDT) support)
$ git merge parisc-hd/for-next
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/pdc.h | 18 +++++
arch/parisc/include/asm/pdcpat.h | 35 ++++++---
arch/parisc/include/asm/pgtable.h | 3 +
arch/parisc/include/asm/processor.h | 2 +
arch/parisc/include/asm/uaccess.h | 11 ---
arch/parisc/include/uapi/asm/pdc.h | 12 +--
arch/parisc/kernel/Makefile | 2 +-
arch/parisc/kernel/asm-offsets.c | 5 --
arch/parisc/kernel/firmware.c | 108 +++++++++++++++++++++++++++
arch/parisc/kernel/inventory.c | 9 +++
arch/parisc/kernel/pdt.c | 141 ++++++++++++++++++++++++++++++++++++
arch/parisc/kernel/processor.c | 5 +-
arch/parisc/kernel/time.c | 24 +++++-
arch/parisc/lib/lusercopy.S | 25 +++----
arch/parisc/mm/fault.c | 9 ---
arch/parisc/mm/init.c | 3 +
16 files changed, 350 insertions(+), 62 deletions(-)
create mode 100644 arch/parisc/kernel/pdt.c
Merging powerpc/next (5a61ef74f269 powerpc/64s: Support new device tree binding for discovering CPU features)
$ git merge powerpc/next
Auto-merging drivers/soc/fsl/qbman/qman.c
Auto-merging drivers/of/fdt.c
Auto-merging arch/powerpc/kernel/setup_64.c
Auto-merging arch/powerpc/kernel/setup-common.c
Auto-merging arch/powerpc/kernel/exceptions-64s.S
Auto-merging arch/powerpc/Kconfig
Merge made by the 'recursive' strategy.
.../bindings/powerpc/ibm,powerpc-cpu-features.txt | 248 +++++
.../devicetree/bindings/soc/fsl/cpm_qe/gpio.txt | 21 +-
arch/powerpc/Kconfig | 16 +
arch/powerpc/Makefile.postlink | 2 +-
arch/powerpc/include/asm/book3s/64/hash-64k.h | 6 +-
arch/powerpc/include/asm/cpm1.h | 2 +
arch/powerpc/include/asm/cpu_has_feature.h | 6 +-
arch/powerpc/include/asm/cputable.h | 2 +
arch/powerpc/include/asm/dt_cpu_ftrs.h | 26 +
arch/powerpc/include/asm/processor.h | 5 +
arch/powerpc/include/asm/reg.h | 1 +
arch/powerpc/include/uapi/asm/cputable.h | 7 +
arch/powerpc/kernel/Makefile | 1 +
arch/powerpc/kernel/cputable.c | 37 +-
arch/powerpc/kernel/dt_cpu_ftrs.c | 1031 ++++++++++++++++++++
arch/powerpc/kernel/exceptions-64e.S | 12 +
arch/powerpc/kernel/exceptions-64s.S | 4 +-
arch/powerpc/kernel/prom.c | 29 +-
arch/powerpc/kernel/setup-common.c | 2 +-
arch/powerpc/kernel/setup_64.c | 10 +-
arch/powerpc/platforms/powernv/eeh-powernv.c | 3 +
arch/powerpc/sysdev/cpm1.c | 25 +
drivers/net/ethernet/freescale/ucc_geth.c | 8 +-
drivers/of/fdt.c | 38 +
drivers/soc/fsl/qbman/qman.c | 5 +
drivers/soc/fsl/qe/qe.c | 25 +-
drivers/soc/fsl/qe/qe_tdm.c | 2 +
include/linux/of_fdt.h | 6 +
include/soc/fsl/qe/immap_qe.h | 19 -
include/soc/fsl/qe/qe.h | 1 +
30 files changed, 1546 insertions(+), 54 deletions(-)
create mode 100644 Documentation/devicetree/bindings/powerpc/ibm,powerpc-cpu-features.txt
create mode 100644 arch/powerpc/include/asm/dt_cpu_ftrs.h
create mode 100644 arch/powerpc/kernel/dt_cpu_ftrs.c
Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (8e4b8e130264 s390/scm: use multiple queues)
$ git merge s390/features
Removing drivers/s390/block/scm_blk_cluster.c
Auto-merging drivers/s390/block/Kconfig
Auto-merging arch/s390/mm/vmem.c
Auto-merging arch/s390/mm/pageattr.c
Auto-merging arch/s390/kernel/ftrace.c
Merge made by the 'recursive' strategy.
arch/s390/Kconfig | 2 +-
arch/s390/crypto/arch_random.c | 1 +
arch/s390/include/asm/debug.h | 3 +-
arch/s390/include/asm/dis.h | 2 +
arch/s390/include/asm/kprobes.h | 20 +--
arch/s390/include/asm/page.h | 3 +
arch/s390/include/asm/pgalloc.h | 25 +++-
arch/s390/include/asm/pgtable.h | 80 +++++++++--
arch/s390/include/asm/processor.h | 4 +-
arch/s390/include/asm/sysinfo.h | 2 +-
arch/s390/include/asm/tlb.h | 15 +++
arch/s390/kernel/debug.c | 8 +-
arch/s390/kernel/entry.S | 21 ++-
arch/s390/kernel/ftrace.c | 4 +
arch/s390/kernel/traps.c | 1 +
arch/s390/kernel/vmlinux.lds.S | 8 +-
arch/s390/lib/probes.c | 1 +
arch/s390/lib/uaccess.c | 4 +-
arch/s390/mm/dump_pagetables.c | 23 +++-
arch/s390/mm/gmap.c | 11 +-
arch/s390/mm/gup.c | 33 ++++-
arch/s390/mm/hugetlbpage.c | 30 +++--
arch/s390/mm/mmap.c | 4 +-
arch/s390/mm/pageattr.c | 30 ++++-
arch/s390/mm/pgalloc.c | 57 +++++---
arch/s390/mm/pgtable.c | 6 +-
arch/s390/mm/vmem.c | 44 +++++-
drivers/crypto/Kconfig | 2 +-
drivers/s390/block/Kconfig | 7 -
drivers/s390/block/Makefile | 3 -
drivers/s390/block/scm_blk.c | 246 +++++++++++++++------------------
drivers/s390/block/scm_blk.h | 60 +--------
drivers/s390/block/scm_blk_cluster.c | 255 -----------------------------------
drivers/s390/cio/ccwgroup.c | 4 +-
drivers/s390/cio/qdio_debug.h | 2 +-
drivers/s390/crypto/pkey_api.c | 2 +-
drivers/tty/hvc/Kconfig | 3 +-
37 files changed, 461 insertions(+), 565 deletions(-)
delete mode 100644 drivers/s390/block/scm_blk_cluster.c
Merging sparc-next/master (94836ecf1e73 Merge tag 'nfsd-4.11-2' of git://linux-nfs.org/~bfields/linux)
$ git merge sparc-next/master
Already up-to-date.
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
$ git merge sh/for-next
Already up-to-date.
Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory)
$ git merge tile/master
Merge made by the 'recursive' strategy.
arch/tile/include/uapi/arch/abi.h | 49 +++----------------------
arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++
arch/tile/mm/init.c | 30 ----------------
3 files changed, 74 insertions(+), 75 deletions(-)
create mode 100644 arch/tile/include/uapi/arch/intreg.h
Merging uml/linux-next (ce4586063f1a um: Add missing NR_CPUS include)
$ git merge uml/linux-next
Auto-merging arch/um/Kconfig.common
Merge made by the 'recursive' strategy.
arch/um/Kconfig.common | 5 +++++
arch/um/kernel/initrd.c | 4 +---
arch/um/kernel/sysrq.c | 6 ++----
arch/um/kernel/um_arch.c | 6 ++++++
arch/um/os-Linux/skas/process.c | 4 +---
arch/x86/um/ptrace_64.c | 2 +-
arch/x86/um/shared/sysdep/kernel-offsets.h | 9 +--------
7 files changed, 17 insertions(+), 19 deletions(-)
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Auto-merging arch/unicore32/include/asm/Kbuild
Merge made by the 'recursive' strategy.
arch/unicore32/Kconfig | 14 +
arch/unicore32/include/asm/Kbuild | 3 -
arch/unicore32/include/asm/signal.h | 21 +
arch/unicore32/include/asm/syscalls.h | 25 +
arch/unicore32/include/uapi/asm/sigcontext.h | 14 +
arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++
arch/unicore32/include/uapi/asm/stat.h | 19 +
arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
arch/unicore32/include/uapi/asm/unistd.h | 8 +
arch/unicore32/kernel/entry.S | 17 +
arch/unicore32/kernel/signal.c | 41 ++
11 files changed, 1000 insertions(+), 3 deletions(-)
create mode 100644 arch/unicore32/include/asm/signal.h
create mode 100644 arch/unicore32/include/asm/syscalls.h
create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
create mode 100644 arch/unicore32/include/uapi/asm/stat.h
create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
Merging xtensa/xtensa-for-next (6fad04b7585d Merge branch 'xtensa-fixes' into xtensa-for-next)
$ git merge xtensa/xtensa-for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging fscrypt/master (6f9d696f016f fscrypt: correct collision claim for digested names)
$ git merge fscrypt/master
Already up-to-date.
Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
$ git merge btrfs/next
Already up-to-date.
Merging btrfs-kdave/for-next (953a8bf6cedd Merge branch 'for-next-next-v4.12-20170425' into for-next-20170425)
$ git merge btrfs-kdave/for-next
Resolved 'fs/btrfs/file.c' using previous resolution.
Auto-merging fs/btrfs/qgroup.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
CONFLICT (content): Merge conflict in fs/btrfs/file.c
Auto-merging fs/btrfs/extent_io.h
Auto-merging fs/btrfs/ctree.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master e46ae1a9325b] Merge remote-tracking branch 'btrfs-kdave/for-next'
$ git diff -M --stat --summary HEAD^..
fs/btrfs/ctree.h | 12 ++-
fs/btrfs/extent-tree.c | 31 +++++---
fs/btrfs/extent_io.h | 14 +++-
fs/btrfs/file.c | 46 ++++++++----
fs/btrfs/inode-map.c | 6 +-
fs/btrfs/inode.c | 64 ++++++++++------
fs/btrfs/ioctl.c | 11 ++-
fs/btrfs/qgroup.c | 196 ++++++++++++++++++++++++++++++++++++-------------
fs/btrfs/qgroup.h | 8 +-
fs/btrfs/relocation.c | 13 ++--
fs/btrfs/transaction.c | 10 ---
11 files changed, 283 insertions(+), 128 deletions(-)
Merging ceph/master (eeca958dce0a ceph: fix memory leak in __ceph_setxattr())
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (de1892b887ee Don't delay freeing mids when blocked on slow socket write of request)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/cifssmb.c | 7 -------
fs/cifs/file.c | 2 +-
fs/cifs/smb2pdu.c | 7 -------
fs/cifs/transport.c | 2 --
4 files changed, 1 insertion(+), 17 deletions(-)
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
fs/ecryptfs/crypto.c | 15 ---------------
fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++-
fs/ecryptfs/keystore.c | 2 +-
fs/ecryptfs/main.c | 2 +-
fs/ecryptfs/miscdev.c | 2 +-
5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (07f7e3135e58 Merge branch 'fsnotify' into for_next)
$ git merge ext3/for_next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ext4/dev (17f423b51607 jbd2: cleanup write flags handling from jbd2_write_superblock())
$ git merge ext4/dev
Already up-to-date.
Merging f2fs/dev (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
$ git merge f2fs/dev
Already up-to-date.
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
$ git merge freevxfs/for-next
Already up-to-date.
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
$ git merge fscache/fscache
Already up-to-date.
Merging fuse/for-next (0b6e9ea041e6 fuse: Add support for pid namespaces)
$ git merge fuse/for-next
Already up-to-date.
Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size)
$ git merge jfs/jfs-next
Auto-merging fs/jfs/super.c
Merge made by the 'recursive' strategy.
fs/jfs/resize.c | 4 ++--
fs/jfs/super.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Merging nfs/linux-next (76b2a303384e pNFS/flexfiles: Always attempt to call layoutstats when flexfiles is enabled)
$ git merge nfs/linux-next
Already up-to-date.
Merging nfsd/nfsd-next (b26b78cb7260 nfsd: Fix up the "supattr_exclcreat" attributes)
$ git merge nfsd/nfsd-next
Already up-to-date.
Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (65f2673832d4 ovl: update documentation w.r.t. constant inode numbers)
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (7bccd12d27b7 ubi: Add debugfs file for tracking PEB state)
$ git merge ubifs/linux-next
Auto-merging fs/ubifs/xattr.c
Auto-merging fs/ubifs/ubifs.h
Auto-merging fs/ubifs/ioctl.c
Auto-merging drivers/mtd/ubi/build.c
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/build.c | 10 ++--
drivers/mtd/ubi/debug.c | 126 +++++++++++++++++++++++++++++++++++++++++++++-
drivers/mtd/ubi/fastmap.c | 33 ++++++++++--
fs/ubifs/Kconfig | 13 +++++
fs/ubifs/debug.c | 4 +-
fs/ubifs/ioctl.c | 6 +--
fs/ubifs/recovery.c | 1 -
fs/ubifs/ubifs.h | 14 +++++-
fs/ubifs/xattr.c | 6 +++
9 files changed, 195 insertions(+), 18 deletions(-)
Merging xfs/for-next (161f55efba5d xfs: fix use-after-free in xfs_finish_page_writeback)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (919bb328b020 Merge branch 'work.misc' into for-next)
$ git merge vfs/for-next
Auto-merging fs/stat.c
Auto-merging fs/open.c
Auto-merging fs/namespace.c
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
fs/namei.c | 104 +++++++++++++++++++++++++++++++++++----------
fs/namespace.c | 18 +++++---
fs/open.c | 9 ++--
fs/stat.c | 4 +-
include/linux/namei.h | 3 ++
include/uapi/linux/fcntl.h | 1 +
6 files changed, 103 insertions(+), 36 deletions(-)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync())
$ git merge vfs-miklos/next
Already up-to-date.
Merging printk/for-next (cf39bf58afda printk: fix double printing with earlycon)
$ git merge printk/for-next
Already up-to-date.
Merging pci/next (3146c8f4de9b Merge branch 'pci/remove' into next)
$ git merge pci/next
Already up-to-date.
Merging pstore/for-next/pstore (3a7d2fd16c57 pstore: Solve lockdep warning by moving inode locks)
$ git merge pstore/for-next/pstore
Already up-to-date.
Merging hid/for-next (edb2a51c6fbb Merge branch 'for-4.12/upstream-fixes' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
drivers/hid/hid-magicmouse.c | 15 ++++++++-------
drivers/hid/wacom_wac.c | 45 ++++++++++++++++++++++----------------------
2 files changed, 31 insertions(+), 29 deletions(-)
Merging i2c/i2c/for-next (f49ee0593cde Merge branch 'i2c/for-4.12' into i2c/for-next)
$ git merge i2c/i2c/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (b3398adc0da6 firmware: dmi_scan: Look for SMBIOS 3 entry point first)
$ git merge dmi/master
Merge made by the 'recursive' strategy.
drivers/firmware/dmi_scan.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
Merging hwmon-staging/hwmon-next (6eaaea144dc5 hwmon: (pmbus) Add client driver for IR35221)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
Documentation/hwmon/ir35221 | 87 ++++++++++++
drivers/hwmon/pmbus/Kconfig | 10 ++
drivers/hwmon/pmbus/Makefile | 1 +
drivers/hwmon/pmbus/ir35221.c | 313 ++++++++++++++++++++++++++++++++++++++++++
4 files changed, 411 insertions(+)
create mode 100644 Documentation/hwmon/ir35221
create mode 100644 drivers/hwmon/pmbus/ir35221.c
Merging jc_docs/docs-next (25a0da73f24c doc: replace FTP URL to kernel.org with HTTPS one)
$ git merge jc_docs/docs-next
Already up-to-date.
Merging v4l-dvb/master (3622d3e77ece [media] ov2640: print error if devm_*_optional*() fails)
$ git merge v4l-dvb/master
Already up-to-date.
Merging v4l-dvb-next/master (6d95b3f24881 Merge branch 'TTT' into to_next)
$ git merge v4l-dvb-next/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging fbdev/fbdev-for-next (34bf129a7f06 fbdev: sti: don't select CONFIG_VT)
$ git merge fbdev/fbdev-for-next
Already up-to-date.
Merging pm/linux-next (0c47322aa0dd Merge branch 'pm-cpufreq-sched' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
kernel/sched/cpufreq_schedutil.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
$ git merge idle/next
Merge made by the 'recursive' strategy.
Merging thermal/next (cb15c81a0c1c Merge branch 'thermal-soc' into next)
$ git merge thermal/next
Resolved 'drivers/thermal/Kconfig' using previous resolution.
Resolved 'drivers/thermal/Makefile' using previous resolution.
Auto-merging drivers/thermal/Makefile
CONFLICT (content): Merge conflict in drivers/thermal/Makefile
Auto-merging drivers/thermal/Kconfig
CONFLICT (content): Merge conflict in drivers/thermal/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master e36732dac7d7] Merge remote-tracking branch 'thermal/next'
$ git diff -M --stat --summary HEAD^..
.../bindings/thermal/brcm,bcm2835-thermal.txt | 32 ++-
.../devicetree/bindings/thermal/brcm,ns-thermal | 37 +++
.../devicetree/bindings/thermal/da9062-thermal.txt | 36 +++
Documentation/thermal/sysfs-api.txt | 21 ++
drivers/thermal/Kconfig | 32 +++
drivers/thermal/Makefile | 2 +
drivers/thermal/broadcom/Kconfig | 16 ++
drivers/thermal/broadcom/Makefile | 2 +
drivers/thermal/broadcom/bcm2835_thermal.c | 314 ++++++++++++++++++++
drivers/thermal/broadcom/ns-thermal.c | 106 +++++++
drivers/thermal/da9062-thermal.c | 315 +++++++++++++++++++++
drivers/thermal/devfreq_cooling.c | 152 +++++++---
drivers/thermal/intel_soc_dts_thermal.c | 9 +-
drivers/thermal/mtk_thermal.c | 2 +-
drivers/thermal/rcar_gen3_thermal.c | 199 ++++++++++++-
drivers/thermal/thermal_core.c | 64 ++++-
.../thermal/ti-soc-thermal/dra752-thermal-data.c | 10 -
.../thermal/ti-soc-thermal/omap3-thermal-data.c | 4 -
.../thermal/ti-soc-thermal/omap4-thermal-data.c | 6 -
.../thermal/ti-soc-thermal/omap5-thermal-data.c | 4 -
drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 -
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 158 +----------
drivers/thermal/ti-soc-thermal/ti-thermal.h | 16 --
include/linux/devfreq_cooling.h | 19 ++
include/trace/events/thermal.h | 11 +-
25 files changed, 1305 insertions(+), 266 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/brcm,ns-thermal
create mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt
create mode 100644 drivers/thermal/broadcom/Kconfig
create mode 100644 drivers/thermal/broadcom/Makefile
create mode 100644 drivers/thermal/broadcom/bcm2835_thermal.c
create mode 100644 drivers/thermal/broadcom/ns-thermal.c
create mode 100644 drivers/thermal/da9062-thermal.c
Merging thermal-soc/next (19fd1783c24e Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
drivers/firewire/net.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure)
$ git merge dlm/next
Auto-merging fs/dlm/user.c
Merge made by the 'recursive' strategy.
fs/dlm/user.c | 2 ++
1 file changed, 2 insertions(+)
Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging net-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
$ git merge net-next/master
Already up-to-date.
Merging ipsec-next/master (e892d2d40445 esp: Fix misplaced spin_unlock_bh.)
$ git merge ipsec-next/master
Already up-to-date.
Merging netfilter-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
$ git merge netfilter-next/master
Already up-to-date.
Merging ipvs-next/master (fb90e8dedb46 ipvs: change comparison on sync_refresh_period)
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (47d272f0f988 Merge tag 'iwlwifi-next-for-kalle-2017-04-26' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next)
$ git merge wireless-drivers-next/master
Already up-to-date.
Merging bluetooth/master (2a25b3faef44 Bluetooth: hci_ldisc: Use rwlocking to avoid closing proto races)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
drivers/bluetooth/Kconfig | 2 +-
drivers/bluetooth/btusb.c | 4 ++++
drivers/bluetooth/hci_ldisc.c | 40 ++++++++++++++++++++++++++++++++-----
drivers/bluetooth/hci_uart.h | 1 +
include/net/bluetooth/hci.h | 8 ++++++++
net/bluetooth/hci_core.c | 46 ++++++++++++++++++++++++++++++++++++++-----
6 files changed, 90 insertions(+), 11 deletions(-)
Merging mac80211-next/master (89c9fea3c803 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial)
$ git merge mac80211-next/master
Already up-to-date.
Merging rdma/for-next (67cf3623e097 rxe: expose num_possible_cpus() cnum_comp_vectors)
$ git merge rdma/for-next
Already up-to-date.
Merging gfs2/for-next (3ef2bc099d1c Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux)
$ git merge gfs2/for-next
Already up-to-date.
Merging mtd/master (a9402889f41c MAINTAINERS: Update NAND subsystem git repositories)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (a9402889f41c MAINTAINERS: Update NAND subsystem git repositories)
$ git merge l2-mtd/master
Already up-to-date.
Merging nand/nand/next (9d2ee0a60b8b mtd: nand: brcmnand: Check flash #WP pin status before nand erase/program)
$ git merge nand/nand/next
Already up-to-date.
Merging spi-nor/next (b67166569698 mtd: spi-nor: Potential oops on error path in quad_enable())
$ git merge spi-nor/next
Auto-merging drivers/mtd/spi-nor/spi-nor.c
Merge made by the 'recursive' strategy.
drivers/mtd/devices/m25p80.c | 121 ++++++---
drivers/mtd/spi-nor/Kconfig | 2 +-
drivers/mtd/spi-nor/aspeed-smc.c | 23 +-
drivers/mtd/spi-nor/atmel-quadspi.c | 83 ++++--
drivers/mtd/spi-nor/cadence-quadspi.c | 18 +-
drivers/mtd/spi-nor/fsl-quadspi.c | 6 +-
drivers/mtd/spi-nor/hisi-sfc.c | 31 ++-
drivers/mtd/spi-nor/intel-spi.c | 7 +-
drivers/mtd/spi-nor/mtk-quadspi.c | 15 +-
drivers/mtd/spi-nor/nxp-spifi.c | 22 +-
drivers/mtd/spi-nor/spi-nor.c | 475 +++++++++++++++++++++++++++-------
drivers/mtd/spi-nor/stm32-quadspi.c | 32 ++-
include/linux/mtd/spi-nor.h | 161 +++++++++++-
13 files changed, 770 insertions(+), 226 deletions(-)
Merging crypto/master (929562b14478 crypto: stm32 - Fix OF module alias information)
$ git merge crypto/master
Already up-to-date.
Merging drm/drm-next (644b4930bf7e Merge tag 'drm/tegra/for-4.12-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next)
$ git merge drm/drm-next
Already up-to-date.
Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (88326ef05b26 drm/i915: Confirm the request is still active before adding it to the await)
$ git merge drm-intel/for-linux-next
Already up-to-date.
Merging drm-tegra/drm/tegra/for-next (b0d36daa0ab5 gpu: host1x: Fix host1x driver shutdown)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/for-linux-next (e345da82bd6b drm/edid: Add 10 bpc quirk for LGD 764 panel in HP zBook 17 G2)
$ git merge drm-misc/for-linux-next
Merge made by the 'recursive' strategy.
drivers/gpu/drm/drm_edid.c | 8 ++++++++
1 file changed, 8 insertions(+)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (98db803f6413 msm/drm: gpu: Dynamically locate the clocks from the device tree)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address)
$ git merge hdlcd/for-upstream/hdlcd
Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/arm/hdlcd_crtc.c | 47 ++++++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 16 deletions(-)
Merging mali-dp/for-upstream/mali-dp (763656d30b3d drm: mali-dp: use div_u64 for expensive 64-bit divisions)
$ git merge mali-dp/for-upstream/mali-dp
Already up-to-date.
Merging sunxi-drm/sunxi-drm/for-next (2da042ac05e9 MAINTAINERS: Add sun4i-drm git repo)
$ git merge sunxi-drm/sunxi-drm/for-next
Already up-to-date.
Merging imx-drm/imx-drm/next (1465dc794b00 gpu: ipu-v3: prg: remove counter load enable)
$ git merge imx-drm/imx-drm/next
Merge made by the 'recursive' strategy.
drivers/gpu/ipu-v3/ipu-prg.c | 2 --
1 file changed, 2 deletions(-)
Merging etnaviv/etnaviv/next (d79fd1ccf2cd drm/etnaviv: implement cooling support for new GPU cores)
$ git merge etnaviv/etnaviv/next
Merge made by the 'recursive' strategy.
drivers/gpu/drm/etnaviv/common.xml.h | 150 ++++++++++++++++-----------
drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 +
drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 +
drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 ++
drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +-
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 30 ++++--
drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 2 +
7 files changed, 125 insertions(+), 70 deletions(-)
Merging kspp/for-next/kspp (62111ab351b8 Merge branch 'for-next/gcc-plugin-infrastructure' into for-next/kspp)
$ git merge kspp/for-next/kspp
Auto-merging arch/Kconfig
Merge made by the 'recursive' strategy.
arch/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
$ git merge regmap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging sound/for-next (a5c3b32a1146 Merge tag 'asoc-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge sound/for-next
Already up-to-date.
Merging sound-asoc/for-next (20d5c84bef06 Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8978' and 'asoc/topic/zte-tdm' into asoc-next)
$ git merge sound-asoc/for-next
Already up-to-date.
Merging modules/modules-next (175861882769 kallsyms: Use bounded strnchr() when parsing string)
$ git merge modules/modules-next
Already up-to-date.
Merging input/next (c3f6f8612bda Input: switch to using sizeof(*type) when allocating memory)
$ git merge input/next
Merge made by the 'recursive' strategy.
drivers/input/input.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
Merging block/for-next (0789bd7bdb5b Merge branch 'for-linus' into for-next)
$ git merge block/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c)
$ git merge lightnvm/for-next
Already up-to-date.
Merging device-mapper/for-next (0e8a4f1a22f4 dm ioctl: report event number in DM_LIST_DEVICES)
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm.c
Auto-merging drivers/md/dm-ioctl.c
Auto-merging drivers/md/dm-core.h
Merge made by the 'recursive' strategy.
drivers/md/dm-cache-policy-smq.c | 31 +++++------
drivers/md/dm-cache-target.c | 27 +++++-----
drivers/md/dm-core.h | 3 ++
drivers/md/dm-ioctl.c | 109 +++++++++++++++++++++++++++++++--------
drivers/md/dm.c | 5 ++
include/uapi/linux/dm-ioctl.h | 6 ++-
6 files changed, 124 insertions(+), 57 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/next (a627f025eb05 mmc: sdhci-of-esdhc: limit SD clock for ls1012a/ls1046a)
$ git merge mmc/next
Already up-to-date.
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_io.c
Merge made by the 'recursive' strategy.
kernel/debug/kdb/kdb_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (23b245c04d0e md/raid1/10: avoid unnecessary locking)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
drivers/md/md.c | 20 ++++----
drivers/md/md.h | 2 +-
drivers/md/raid0.c | 116 +++++++++++++++++++++++++++++++++++++++++------
drivers/md/raid1.c | 16 +++----
drivers/md/raid10.c | 7 ++-
drivers/md/raid5-cache.c | 28 ++++++++----
drivers/md/raid5.c | 29 ++++--------
7 files changed, 149 insertions(+), 69 deletions(-)
Merging mfd/for-mfd-next (ab6241ae07c3 input: touchscreen: mxs-lradc: || vs && typos)
$ git merge mfd/for-mfd-next
Already up-to-date.
Merging backlight/for-backlight-next (e739c5bb20be backlight: Add support for Arctic Sand LED backlight driver chips)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/for-next (35f4f99ccbc1 power: supply: cpcap-charger: Keep trickle charger bits disabled)
$ git merge battery/for-next
Auto-merging .mailmap
Merge made by the 'recursive' strategy.
.mailmap | 2 +
.../bindings/power/supply/axp20x_battery.txt | 20 +
drivers/power/supply/Kconfig | 27 +-
drivers/power/supply/Makefile | 1 +
drivers/power/supply/ab8500_charger.c | 2 +-
drivers/power/supply/axp20x_battery.c | 502 +++++++++++++++++++++
drivers/power/supply/bq24190_charger.c | 149 ++++--
drivers/power/supply/cpcap-charger.c | 11 +-
drivers/power/supply/generic-adc-battery.c | 17 +-
drivers/power/supply/isp1704_charger.c | 4 +
drivers/power/supply/max17042_battery.c | 181 ++++++--
drivers/power/supply/pda_power.c | 49 +-
drivers/power/supply/power_supply_core.c | 20 +-
drivers/power/supply/rx51_battery.c | 1 -
drivers/power/supply/sbs-battery.c | 57 ++-
drivers/power/supply/twl4030_charger.c | 95 ++--
drivers/power/supply/twl4030_madc_battery.c | 1 -
include/linux/power/max17042_battery.h | 9 +-
18 files changed, 975 insertions(+), 173 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/supply/axp20x_battery.txt
create mode 100644 drivers/power/supply/axp20x_battery.c
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (f123e7b2a6e3 Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next)
$ git merge regulator/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging security/next (8979b02aaf1d tpm: Fix reference count to main device)
$ git merge security/next
Already up-to-date.
Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.)
$ git merge integrity/next
Already up-to-date.
Merging keys/keys-next (e36484b5ac31 crypto : asymmetric_keys : verify_pefile:zero memory content before freeing)
$ git merge keys/keys-next
Auto-merging security/keys/keyctl.c
Auto-merging security/keys/gc.c
Merge made by the 'recursive' strategy.
crypto/asymmetric_keys/verify_pefile.c | 4 +--
include/linux/key.h | 1 -
include/linux/mpi.h | 2 +-
include/uapi/linux/keyctl.h | 4 +--
lib/mpi/mpicoder.c | 10 ++++---
security/keys/dh.c | 34 +++++++++++-----------
security/keys/encrypted-keys/encrypted.c | 31 +++++++++-----------
security/keys/gc.c | 4 +--
security/keys/keyctl.c | 4 ++-
security/keys/trusted.c | 50 ++++++++++++++------------------
security/keys/user_defined.c | 16 +++++++---
11 files changed, 79 insertions(+), 81 deletions(-)
Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug)
$ git merge selinux/next
Already up-to-date.
Merging tpmdd/next (da4cee99ca6d tpm_tis: Consolidate the platform and acpi probe flow)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
drivers/char/tpm/tpm-interface.c | 79 ++++++++++--------
drivers/char/tpm/tpm-sysfs.c | 6 +-
drivers/char/tpm/tpm.h | 2 +-
drivers/char/tpm/tpm_tis.c | 175 +++++++++++++--------------------------
4 files changed, 104 insertions(+), 158 deletions(-)
Merging watchdog/master (00078cff73db Merge branch 'watchdog-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging)
$ git merge watchdog/master
Resolved 'drivers/watchdog/iTCO_wdt.c' using previous resolution.
Auto-merging drivers/watchdog/iTCO_wdt.c
CONFLICT (content): Merge conflict in drivers/watchdog/iTCO_wdt.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3aa814bf0f15] Merge remote-tracking branch 'watchdog/master'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++
.../devicetree/bindings/watchdog/renesas-wdt.txt | 4 +-
.../devicetree/bindings/watchdog/st,stm32-iwdg.txt | 19 ++
Documentation/watchdog/watchdog-parameters.txt | 2 +-
drivers/watchdog/Kconfig | 29 ++-
drivers/watchdog/Makefile | 2 +
drivers/watchdog/bcm_kona_wdt.c | 3 +-
drivers/watchdog/cadence_wdt.c | 2 +-
drivers/watchdog/f71808e_wdt.c | 27 ++-
drivers/watchdog/gpio_wdt.c | 73 ++----
drivers/watchdog/iTCO_wdt.c | 22 +-
drivers/watchdog/intel-mid_wdt.c | 17 +-
drivers/watchdog/orion_wdt.c | 2 +-
drivers/watchdog/pcwd_usb.c | 3 +
drivers/watchdog/rza_wdt.c | 199 ++++++++++++++++
drivers/watchdog/s3c2410_wdt.c | 58 +++--
drivers/watchdog/sama5d4_wdt.c | 96 +++++---
drivers/watchdog/stm32_iwdg.c | 253 +++++++++++++++++++++
drivers/watchdog/wdt_pci.c | 2 +-
drivers/watchdog/zx2967_wdt.c | 4 +-
20 files changed, 686 insertions(+), 154 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/st,stm32-iwdg.txt
create mode 100644 drivers/watchdog/rza_wdt.c
create mode 100644 drivers/watchdog/stm32_iwdg.c
Merging iommu/next (2c0248d68880 Merge branches 'arm/exynos', 'arm/omap', 'arm/rockchip', 'arm/mediatek', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd' and 'core' into next)
$ git merge iommu/next
Already up-to-date.
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (7cb671e7a34d vfio/type1: Reduce repetitive calls in vfio_pin_pages_remote())
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver())
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (48d0e023af97 audit: fix the RCU locking for the auditd_connection structure)
$ git merge audit/next
Already up-to-date.
Merging devicetree/for-next (df3ed9323944 Partially Revert "of: fix sparse warnings in fdt, irq, reserved mem, and resolver code")
$ git merge devicetree/for-next
Merge made by the 'recursive' strategy.
drivers/of/of_reserved_mem.c | 2 +-
include/linux/of_irq.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging mailbox/mailbox-for-next (cb710ab1d8a2 mailbox: handle empty message in tx_tick)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (282ec0ea65da Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next)
$ git merge spi/for-next
Already up-to-date.
Merging tip/auto-latest (30e2fc1b448b Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Auto-merging kernel/trace/trace_events.c
Auto-merging kernel/padata.c
Auto-merging kernel/kprobes.c
Auto-merging kernel/fork.c
Auto-merging include/linux/pci.h
Auto-merging include/linux/cpuhotplug.h
Auto-merging drivers/pci/pci-driver.c
Auto-merging arch/x86/mm/init_64.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
Auto-merging arch/powerpc/kvm/book3s_hv.c
Auto-merging arch/arm64/kernel/cpufeature.c
Auto-merging arch/arm64/include/asm/cpufeature.h
Merge made by the 'recursive' strategy.
Documentation/x86/intel_rdt_ui.txt | 2 +-
arch/arm/kernel/hw_breakpoint.c | 5 +-
arch/arm64/include/asm/cpufeature.h | 3 +-
arch/arm64/kernel/cpu_errata.c | 9 +-
arch/arm64/kernel/cpufeature.c | 5 +-
arch/mips/kernel/jump_label.c | 2 -
arch/powerpc/kvm/book3s_hv.c | 8 +-
arch/powerpc/platforms/powernv/subcore.c | 3 +-
arch/s390/kernel/time.c | 2 +-
arch/sparc/kernel/jump_label.c | 2 -
arch/tile/kernel/jump_label.c | 2 -
arch/x86/Makefile | 3 +-
arch/x86/boot/compressed/error.h | 4 +-
arch/x86/boot/compressed/pagetable.c | 2 +-
arch/x86/events/core.c | 1 -
arch/x86/events/intel/core.c | 4 +-
arch/x86/events/intel/cqm.c | 12 +-
arch/x86/events/intel/ds.c | 7 +-
arch/x86/events/intel/rapl.c | 2 +-
arch/x86/include/asm/asm.h | 1 +
arch/x86/include/asm/init.h | 3 +-
arch/x86/kernel/cpu/microcode/amd.c | 2 -
arch/x86/kernel/cpu/mtrr/main.c | 2 -
arch/x86/kernel/jump_label.c | 2 -
arch/x86/kernel/machine_kexec_64.c | 6 +-
arch/x86/kernel/setup.c | 15 ++
arch/x86/kernel/setup_percpu.c | 10 +-
arch/x86/lib/csum-copy_64.S | 12 +-
arch/x86/lib/kaslr.c | 3 +-
arch/x86/mm/ident_map.c | 14 +-
arch/x86/mm/init_64.c | 12 +-
arch/x86/mm/numa_32.c | 1 +
arch/x86/power/hibernate_64.c | 2 +-
drivers/acpi/processor_driver.c | 4 +-
drivers/clocksource/arm_arch_timer.c | 2 +-
drivers/cpufreq/cpufreq.c | 9 +-
drivers/hwtracing/coresight/coresight-etm3x.c | 12 +-
drivers/hwtracing/coresight/coresight-etm4x.c | 12 +-
drivers/pci/pci-driver.c | 47 +++---
include/linux/cpu.h | 2 +
include/linux/cpuhotplug.h | 38 +++++
include/linux/jump_label.h | 27 +++-
include/linux/padata.h | 3 -
include/linux/pci.h | 1 +
include/linux/stop_machine.h | 26 +++-
kernel/cpu.c | 173 ++++++++-------------
kernel/events/callchain.c | 6 +
kernel/events/core.c | 56 ++++---
kernel/fork.c | 2 +-
kernel/jump_label.c | 57 ++++++-
kernel/kprobes.c | 25 +--
kernel/padata.c | 43 ++---
kernel/stop_machine.c | 7 +-
kernel/trace/trace_events.c | 8 +
kernel/tracepoint.c | 4 +-
tools/build/feature/test-sched_getcpu.c | 2 +
tools/include/linux/string.h | 2 +
tools/lib/string.c | 9 ++
tools/lib/subcmd/help.c | 1 +
tools/lib/subcmd/parse-options.c | 1 +
tools/lib/subcmd/subcmd-util.h | 9 --
tools/perf/Documentation/perf-c2c.txt | 4 +-
tools/perf/Documentation/perf-record.txt | 2 +-
tools/perf/Documentation/perf-report.txt | 6 +-
tools/perf/Documentation/perf.data-file-format.txt | 4 +-
tools/perf/Documentation/tips.txt | 2 +-
tools/perf/arch/arm64/annotate/instructions.c | 2 +-
tools/perf/arch/powerpc/util/sym-handling.c | 12 ++
tools/perf/builtin-buildid-cache.c | 13 +-
tools/perf/builtin-c2c.c | 1 +
tools/perf/builtin-config.c | 19 +--
tools/perf/builtin-top.c | 2 +-
tools/perf/builtin-trace.c | 1 +
tools/perf/perf.c | 1 +
tools/perf/tests/hists_cumulate.c | 1 +
tools/perf/tests/hists_filter.c | 1 +
tools/perf/tests/hists_output.c | 1 +
tools/perf/tests/kmod-path.c | 2 +
tools/perf/tests/sdt.c | 1 -
tools/perf/ui/setup.c | 3 +
tools/perf/util/Build | 1 +
tools/perf/util/build-id.h | 4 +
tools/perf/util/event.c | 10 +-
tools/perf/util/event.h | 14 +-
tools/perf/util/evsel.c | 1 +
tools/perf/util/header.c | 1 +
tools/perf/util/intel-pt.c | 1 +
tools/perf/util/machine.c | 28 ++--
tools/perf/util/map.c | 5 -
tools/perf/util/map.h | 5 +-
tools/perf/util/memswap.c | 24 +++
tools/perf/util/memswap.h | 7 +
.../perf/util/scripting-engines/trace-event-perl.c | 4 +-
tools/perf/util/session.c | 1 +
tools/perf/util/strbuf.c | 9 --
tools/perf/util/symbol.c | 72 ++++++---
tools/perf/util/symbol.h | 11 ++
tools/perf/util/units.c | 29 ++++
tools/perf/util/units.h | 7 +
tools/perf/util/util.c | 49 ------
tools/perf/util/util.h | 26 ----
101 files changed, 692 insertions(+), 446 deletions(-)
create mode 100644 tools/perf/util/memswap.c
create mode 100644 tools/perf/util/memswap.h
Merging clockevents/clockevents/next (6f9c89000c3f Merge tag 'arch-timer-errata' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into clockevents/4.12)
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (f8d5549df25e EDAC, ghes: Do not enable it by default)
$ git merge edac-amd/for-next
Already up-to-date.
Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
$ git merge irqchip/irqchip/for-next
Already up-to-date.
Merging ftrace/for-next (4dbbe2d8e95c tracing: Use cpumask_available() to check if cpumask variable may be used)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (933dfbd7c437 rcu: Open-code the rcu_cblist_n_lazy_cbs() function)
$ git merge rcu/rcu/next
Already up-to-date.
Merging kvm/linux-next (36c344f3f1ff Merge tag 'kvm-arm-for-v4.12-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD)
$ git merge kvm/linux-next
Already up-to-date.
Merging kvm-arm/next (a2b19e6e2d4b KVM: arm/arm64: vgic-its: Cleanup after failed ITT restore)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E)
$ git merge kvm-mips/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (fb7dcf723dd2 Merge remote-tracking branch 'remotes/powerpc/topic/xive' into kvm-ppc-next)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (e000b8e0968d s390: kvm: Cpu model support for msa6, msa7 and msa8)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (69861e0a52f8 xen: adjust early dom0 p2m handling to xen hypervisor behavior)
$ git merge xen-tip/linux-next
Auto-merging arch/x86/kernel/cpu/amd.c
Merge made by the 'recursive' strategy.
arch/x86/kernel/cpu/amd.c | 5 +++--
arch/x86/xen/enlighten_pv.c | 42 ++++++++++++++++--------------------------
arch/x86/xen/mmu_pv.c | 7 ++++---
arch/x86/xen/time.c | 2 +-
4 files changed, 24 insertions(+), 32 deletions(-)
Merging percpu/for-next (1328710b8ec3 mark most percpu globals as __ro_after_init)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
mm/percpu.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next)
$ git merge workqueues/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging drivers-x86/for-next (6df97f85611c platform/x86: Make SILEAD_DMI depend on TOUCHSCREEN_SILEAD)
$ git merge drivers-x86/for-next
Already up-to-date.
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
Merging hsi/for-next (3026050179a3 HSI: ssi_protocol: double free in ssip_pn_xmit())
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (28c5fe99016d leds: pca9532: Extend pca9532 device tree support)
$ git merge leds/for-next
Already up-to-date.
Merging ipmi/for-next (2c1175c2e8e5 ipmi/watchdog: fix wdog hang on panic waiting for ipmi response)
$ git merge ipmi/for-next
Already up-to-date.
Merging driver-core/driver-core-next (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging usb/usb-next (c034a43e72dd staging: typec: Fairchild FUSB302 Type-c chip driver)
$ git merge usb/usb-next
Already up-to-date.
Merging usb-gadget/next (2868b2513aa7 Merge tag 'linux-kselftest-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (31c5d1922b90 USB: serial: ftdi_sio: add device ID for Microsemi/Arrow SF2PLUS Dev Kit)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (a932a8041ff9 usb: chipidea: core: add sysfs group)
$ git merge usb-chipidea-next/ci-for-usb-next
Already up-to-date.
Merging phy-next/next (6239879b415e phy: qcom-qusb2: add NVMEM dependency)
$ git merge phy-next/next
Already up-to-date.
Merging tty/tty-next (8e1c21f48694 serial: small Makefile reordering)
$ git merge tty/tty-next
Already up-to-date.
Merging char-misc/char-misc-next (af82455f7dbd Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging extcon/extcon-next (70641a0a84e1 extcon: Use BIT() macro for the left-shift operation)
$ git merge extcon/extcon-next
Already up-to-date.
Merging staging/staging-next (56868a460b83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide)
$ git merge staging/staging-next
Already up-to-date.
Merging mux/for-next (a351e9b9fc24 Linux 4.11)
$ git merge mux/for-next
Already up-to-date.
Merging slave-dma/next (eb4b66156318 Merge branch 'for-linus' into next)
$ git merge slave-dma/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cgroup/for-next (0948307b3a5d Merge branch 'for-4.12' into for-next)
$ git merge cgroup/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging scsi/for-next (e83d14310c40 Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging scsi-mkp/for-next (2d3e4866dea9 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
$ git merge scsi-mkp/for-next
Already up-to-date.
Merging target-updates/for-next (984a9d4c40be Revert "target: Fix VERIFY and WRITE VERIFY command parsing")
$ git merge target-updates/for-next
Auto-merging drivers/target/target_core_pscsi.c
Auto-merging drivers/target/target_core_device.c
Auto-merging drivers/target/iscsi/iscsi_target_configfs.c
Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
Merge made by the 'recursive' strategy.
Documentation/target/target-export-device | 80 ++++
drivers/infiniband/ulp/srpt/ib_srpt.c | 9 +-
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 114 +++--
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.h | 2 +
drivers/target/iscsi/iscsi_target.c | 51 +--
drivers/target/iscsi/iscsi_target_configfs.c | 1 +
drivers/target/iscsi/iscsi_target_login.c | 1 +
drivers/target/target_core_configfs.c | 54 ++-
drivers/target/target_core_device.c | 38 ++
drivers/target/target_core_file.c | 32 +-
drivers/target/target_core_iblock.c | 12 +-
drivers/target/target_core_iblock.h | 3 +-
drivers/target/target_core_pr.c | 2 +-
drivers/target/target_core_pr.h | 9 +-
drivers/target/target_core_pscsi.c | 3 +-
drivers/target/target_core_rd.c | 50 +--
drivers/target/target_core_sbc.c | 10 +-
drivers/target/target_core_tpg.c | 7 +
drivers/target/target_core_transport.c | 2 +-
drivers/target/target_core_user.c | 645 +++++++++++++++++++++------
include/scsi/scsi_proto.h | 1 +
include/target/target_core_backend.h | 1 +
include/target/target_core_base.h | 1 +
23 files changed, 859 insertions(+), 269 deletions(-)
create mode 100755 Documentation/target/target-export-device
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging target-bva/for-next (0c4a75c68799 target: Fix overflow/underflow handling of commands with a Data-Out buffer)
$ git merge target-bva/for-next
Auto-merging drivers/target/target_core_sbc.c
Merge made by the 'recursive' strategy.
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 +
drivers/target/iscsi/iscsi_target.c | 66 ++++++++++++++++---
drivers/target/target_core_sbc.c | 5 +-
drivers/target/target_core_transport.c | 17 -----
drivers/target/target_core_xcopy.c | 110 +++++++++++++++++++------------
5 files changed, 131 insertions(+), 70 deletions(-)
Merging libata/for-next (b4dd60a5ddbc ata: sata_rcar: Handle return value of clk_prepare_enable)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
drivers/ata/ahci.c | 38 ++++++++++++++++++++++++++++++++++++++
drivers/ata/sata_rcar.c | 15 ++++++++++++---
2 files changed, 50 insertions(+), 3 deletions(-)
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (c8b0d7290657 s390/virtio: change maintainership)
$ git merge vhost/linux-next
Already up-to-date.
Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Auto-merging drivers/rpmsg/virtio_rpmsg_bus.c
Merge made by the 'recursive' strategy.
drivers/rpmsg/qcom_smd.c | 11 +++++++++++
drivers/rpmsg/virtio_rpmsg_bus.c | 9 +++++++++
2 files changed, 20 insertions(+)
Merging gpio/for-next (b86c86aa9805 gpio: f7188x: Add a missing break)
$ git merge gpio/for-next
Already up-to-date.
Merging pinctrl/for-next (1aa2faf52f76 pinctrl: mediatek: Add missing pinctrl bindings for mt7623)
$ git merge pinctrl/for-next
Already up-to-date.
Merging pinctrl-samsung/for-next (c8dd100397f3 Merge branch 'pinctrl-next' into for-next)
$ git merge pinctrl-samsung/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (97512ceafaac Merge branch 'for-4.12/drivers' into for-next)
$ git merge pwm/for-next
Already up-to-date.
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 431dd346b4d1] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
MAINTAINERS | 11 +++++++++++
1 file changed, 11 insertions(+)
Merging userns/for-next (d66bb1607e2d proc: Fix unbalanced hard link numbers)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout)
$ git merge ktest/for-next
Already up-to-date.
Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block)
$ git merge random/dev
Already up-to-date.
Merging aio/master (b562e44f507e Linux 4.5)
$ git merge aio/master
Already up-to-date.
Merging kselftest/next (945f8f5f8633 selftests: x86: add missing executables to .gitignore)
$ git merge kselftest/next
Already up-to-date.
Merging y2038/y2038 (69973b830859 Linux 4.9)
$ git merge y2038/y2038
Already up-to-date.
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (608822c0f7af Merge branch 'for-4.12/upstream' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (8b3fa19142e8 coresight: tmc: minor fix for output log)
$ git merge coresight/next
Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c
Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c
Merge made by the 'recursive' strategy.
drivers/hwtracing/coresight/coresight-etm-perf.c | 3 +--
drivers/hwtracing/coresight/coresight-tmc-etf.c | 25 +++++++++++------
drivers/hwtracing/coresight/coresight.c | 34 ++++++++++++++++++------
3 files changed, 44 insertions(+), 18 deletions(-)
Merging rtc/rtc-next (332e0d13d3c7 rtc: gemini: add return value validation)
$ git merge rtc/rtc-next
Already up-to-date.
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (8376efd31d3d x86, pmem: Fix cache flushing for iovec write < 8 bytes)
$ git merge nvdimm/libnvdimm-for-next
Auto-merging include/linux/blkdev.h
Auto-merging fs/xfs/xfs_super.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ext2/super.c
Auto-merging fs/block_dev.c
Auto-merging block/Kconfig
Merge made by the 'recursive' strategy.
arch/x86/include/asm/pmem.h | 2 +-
block/Kconfig | 1 -
drivers/dax/Kconfig | 7 +---
drivers/dax/super.c | 81 ++++++++++++++++++++++++++++++++++++++++-----
fs/Kconfig | 1 +
fs/block_dev.c | 66 ------------------------------------
fs/ext2/super.c | 1 +
fs/ext4/super.c | 1 +
fs/xfs/xfs_super.c | 1 +
include/linux/blkdev.h | 2 --
include/linux/dax.h | 30 +++++++++++++++--
11 files changed, 107 insertions(+), 86 deletions(-)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too)
$ git merge idr/idr-4.11
Already up-to-date.
Merging akpm-current/current (da567ccdcecf fault-inject: add /proc/<pid>/fail-nth)
$ git merge --no-ff akpm-current/current
Auto-merging kernel/fork.c
Auto-merging fs/proc/base.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
Merge made by the 'recursive' strategy.
Documentation/fault-injection/fault-injection.txt | 79 +++++++++++++++++++++++
arch/arm/include/asm/page.h | 2 +
arch/x86/kernel/machine_kexec_64.c | 1 +
block/genhd.c | 2 +-
fs/ocfs2/dlm/dlmmaster.c | 66 +++++++++++++------
fs/ocfs2/dlm/dlmrecovery.c | 40 +++++-------
fs/proc/base.c | 44 +++++++++++++
include/linux/crash_core.h | 2 +
include/linux/reboot.h | 4 ++
include/linux/sched.h | 1 +
include/uapi/linux/sysctl.h | 4 ++
kernel/fork.c | 4 ++
kernel/gcov/base.c | 6 ++
kernel/gcov/gcc_4_7.c | 4 +-
kernel/reboot.c | 27 ++++++++
lib/fault-inject.c | 7 ++
mm/khugepaged.c | 4 +-
mm/memory-failure.c | 3 +
mm/memory_hotplug.c | 4 ++
mm/page_alloc.c | 5 ++
mm/page_owner.c | 4 +-
mm/vmscan.c | 17 +++--
mm/vmstat.c | 2 -
scripts/gdb/linux/constants.py.in | 7 ++
scripts/gdb/linux/proc.py | 73 +++++++++++++++++++++
25 files changed, 357 insertions(+), 55 deletions(-)
$ 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: imx7: fix Kconfig warning and build errors
Applying: sparc64: NG4 memset 32 bits overflow
Applying: mm: zero hash tables in allocator
Applying: mm: update callers to use HASH_ZERO flag
Applying: mm: adaptive hash table scaling
Applying: time: delete current_fs_time()
Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ 3237e8295d3f...743b721f9999 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (743b721f9999 lib/crc-ccitt: add CCITT-FALSE CRC16 variant)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
arch/sparc/lib/NG4memset.S | 26 ++++++++---------
drivers/soc/imx/Kconfig | 1 +
fs/dcache.c | 18 +++---------
fs/inode.c | 14 ++-------
fs/namespace.c | 10 ++-----
include/linux/bootmem.h | 2 ++
include/linux/crc-ccitt.h | 7 +++++
include/linux/fs.h | 1 -
kernel/locking/qspinlock_paravirt.h | 3 +-
kernel/pid.c | 7 ++---
kernel/time/time.c | 14 ---------
lib/crc-ccitt.c | 58 ++++++++++++++++++++++++++++++++++++-
mm/page_alloc.c | 31 ++++++++++++++++++--
13 files changed, 120 insertions(+), 72 deletions(-)
|
