1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
|
$ date -R
Tue, 28 Feb 2023 09:11:08 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at f3a2439f20d9 Merge tag 'rproc-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux
Merging origin/master (982818426a0f Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating f3a2439f20d9..982818426a0f
Fast-forward (no commit created; -m option ignored)
Documentation/ABI/testing/debugfs-driver-dcc | 127 ++
Documentation/ABI/testing/debugfs-scmi | 70 +
Documentation/ABI/testing/debugfs-scmi-raw | 117 ++
.../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 +
.../bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 +
.../bindings/firmware/meson/meson_sm.txt | 15 -
.../devicetree/bindings/firmware/qcom,scm.yaml | 68 +-
.../bindings/input/mediatek,pmic-keys.yaml | 1 +
.../devicetree/bindings/leds/leds-mt6323.txt | 2 +-
.../devicetree/bindings/mfd/mediatek,mt6357.yaml | 111 ++
Documentation/devicetree/bindings/mfd/mt6397.txt | 2 +-
Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 ----
.../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +-
.../bindings/mmc/amlogic,meson-gx-mmc.yaml | 76 ++
.../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 -
.../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +-
.../devicetree/bindings/mmc/arasan,sdhci.yaml | 6 +-
.../devicetree/bindings/mmc/cdns,sdhci.yaml | 25 +-
.../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 21 +-
.../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 2 +-
.../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 4 +-
.../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +-
.../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +-
.../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +-
.../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 +-
Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 2 +-
.../bindings/mmc/nvidia,tegra20-sdhci.yaml | 34 +-
Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +-
.../devicetree/bindings/mmc/renesas,mmcif.yaml | 2 +-
.../devicetree/bindings/mmc/renesas,sdhi.yaml | 8 +-
.../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 3 +-
.../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +-
.../devicetree/bindings/mmc/sdhci-msm.yaml | 4 +
.../devicetree/bindings/mmc/sdhci-pxa.yaml | 19 +-
.../bindings/mmc/socionext,uniphier-sd.yaml | 10 +
.../bindings/mmc/starfive,jh7110-mmc.yaml | 77 ++
.../devicetree/bindings/mmc/sunplus,mmc.yaml | 2 +-
.../bindings/mmc/synopsys-dw-mshc-common.yaml | 2 +-
.../bindings/phy/samsung,dp-video-phy.yaml | 5 +-
.../bindings/phy/samsung,mipi-video-phy.yaml | 11 +-
.../bindings/power/allwinner,sun20i-d1-ppu.yaml | 54 +
.../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +-
.../bindings/power/mediatek,power-controller.yaml | 2 +
.../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +-
.../bindings/power/starfive,jh7110-pmu.yaml | 45 +
.../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +-
.../devicetree/bindings/riscv/sifive,ccache0.yaml | 9 +-
.../bindings/soc/mediatek/mediatek,mutex.yaml | 1 +
.../bindings/soc/mediatek/mediatek,pwrap.yaml | 147 ++
.../devicetree/bindings/soc/mediatek/pwrap.txt | 75 -
.../devicetree/bindings/soc/qcom/qcom,dcc.yaml | 44 +
.../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 +
.../bindings/soc/qcom/qcom,pmic-glink.yaml | 95 ++
.../devicetree/bindings/soc/qcom/qcom,rpm.yaml | 101 ++
.../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 3 +-
.../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 +
MAINTAINERS | 29 +-
arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts | 2 +-
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts | 2 +-
arch/arm/boot/dts/exynos4-cpu-thermal.dtsi | 2 +-
arch/arm/boot/dts/exynos4210.dtsi | 1 -
arch/arm/boot/dts/exynos5250.dtsi | 2 +-
arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 -
arch/arm/boot/dts/exynos5422-odroidhc1.dts | 10 +-
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 10 +-
arch/arm/boot/dts/spear320-hmi.dts | 2 +-
arch/arm/mach-qcom/platsmp.c | 2 +-
arch/arm64/configs/defconfig | 3 +-
arch/csky/lib/delay.c | 2 +-
arch/m68k/68000/dragen2.c | 2 +-
arch/m68k/Kconfig.machine | 8 +-
drivers/bus/imx-weim.c | 4 +-
drivers/cpuidle/cpuidle-qcom-spm.c | 2 +-
drivers/firmware/arm_scmi/Kconfig | 32 +
drivers/firmware/arm_scmi/Makefile | 9 +-
drivers/firmware/arm_scmi/bus.c | 395 ++++--
drivers/firmware/arm_scmi/common.h | 100 +-
drivers/firmware/arm_scmi/driver.c | 1223 +++++++++++------
drivers/firmware/arm_scmi/mailbox.c | 6 +-
drivers/firmware/arm_scmi/optee.c | 6 +-
drivers/firmware/arm_scmi/protocols.h | 7 +
drivers/firmware/arm_scmi/raw_mode.c | 1443 ++++++++++++++++++++
drivers/firmware/arm_scmi/raw_mode.h | 31 +
drivers/firmware/arm_scmi/smc.c | 6 +-
drivers/firmware/arm_scmi/virtio.c | 4 +-
drivers/firmware/meson/meson_sm.c | 2 +-
drivers/firmware/qcom_scm-legacy.c | 2 +-
drivers/firmware/qcom_scm-smc.c | 88 +-
drivers/firmware/qcom_scm.c | 92 +-
drivers/firmware/qcom_scm.h | 8 +
drivers/firmware/xilinx/zynqmp.c | 27 +-
drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +-
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +-
drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +-
drivers/input/keyboard/mtk-pmic-keys.c | 17 +
drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +-
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 +-
drivers/iommu/arm/arm-smmu/qcom_iommu.c | 2 +-
drivers/media/platform/qcom/venus/firmware.c | 2 +-
drivers/memory/renesas-rpc-if.c | 155 ++-
drivers/memory/ti-emif-pm.c | 7 +-
drivers/memstick/core/Kconfig | 2 +
drivers/misc/fastrpc.c | 2 +-
drivers/mmc/core/Kconfig | 3 +-
drivers/mmc/core/block.c | 25 +-
drivers/mmc/core/host.c | 26 +
drivers/mmc/core/mmc_ops.c | 1 +
drivers/mmc/core/pwrseq_simple.c | 4 +-
drivers/mmc/core/sdio_io.c | 2 +-
drivers/mmc/core/slot-gpio.c | 17 +-
drivers/mmc/host/Kconfig | 11 +
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/atmel-mci.c | 3 -
drivers/mmc/host/dw_mmc-starfive.c | 186 +++
drivers/mmc/host/jz4740_mmc.c | 38 +-
drivers/mmc/host/meson-gx-mmc.c | 92 +-
drivers/mmc/host/moxart-mmc.c | 9 +
drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +
drivers/mmc/host/sdhci-brcmstb.c | 8 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 66 +-
drivers/mmc/host/sdhci-iproc.c | 14 +-
drivers/mmc/host/sdhci-msm.c | 2 +-
drivers/mmc/host/sdhci-of-dwcmshc.c | 19 +-
drivers/mmc/host/sdhci-pci-core.c | 8 +-
drivers/mmc/host/sdhci-pxav2.c | 154 ++-
drivers/mmc/host/sdhci-pxav3.c | 4 +-
drivers/mmc/host/sdhci-sprd.c | 6 +-
drivers/mmc/host/sdhci.c | 3 -
drivers/mmc/host/sdhci.h | 2 -
drivers/mmc/host/uniphier-sd.c | 83 +-
drivers/mtd/hyperbus/rpc-if.c | 18 +-
drivers/net/ipa/ipa_main.c | 2 +-
drivers/net/wireless/ath/ath10k/qmi.c | 2 +-
drivers/phy/samsung/phy-exynos-dp-video.c | 7 +-
drivers/phy/samsung/phy-exynos-mipi-video.c | 7 +-
drivers/pinctrl/qcom/pinctrl-msm.c | 2 +-
drivers/power/supply/Kconfig | 9 +
drivers/power/supply/Makefile | 1 +
drivers/power/supply/qcom_battmgr.c | 1411 +++++++++++++++++++
drivers/remoteproc/qcom_q6v5_mss.c | 2 +-
drivers/remoteproc/qcom_q6v5_pas.c | 2 +-
drivers/remoteproc/qcom_wcnss.c | 2 +-
drivers/soc/Kconfig | 2 +
drivers/soc/Makefile | 4 +-
drivers/soc/amlogic/meson-ee-pwrc.c | 17 +
drivers/soc/apple/apple-pmgr-pwrstate.c | 11 +-
drivers/soc/apple/rtkit-crashlog.c | 93 ++
drivers/soc/apple/rtkit.c | 36 +-
drivers/soc/bcm/bcm2835-power.c | 6 -
drivers/soc/imx/Kconfig | 11 +
drivers/soc/imx/Makefile | 6 +-
drivers/soc/imx/imx8m-blk-ctrl.c | 27 +-
drivers/soc/imx/imx8mp-blk-ctrl.c | 108 ++
drivers/soc/imx/imx93-pd.c | 1 -
drivers/soc/imx/imx93-src.c | 1 -
drivers/soc/mediatek/Kconfig | 7 +-
drivers/soc/mediatek/Makefile | 1 +
drivers/soc/mediatek/mt8186-pm-domains.h | 4 +-
drivers/soc/mediatek/mt8188-mmsys.h | 149 ++
drivers/soc/mediatek/mt8188-pm-domains.h | 623 +++++++++
drivers/soc/mediatek/mt8195-mmsys.h | 146 ++
drivers/soc/mediatek/mtk-devapc.c | 11 +-
drivers/soc/mediatek/mtk-mmsys.c | 200 ++-
drivers/soc/mediatek/mtk-mmsys.h | 2 +
drivers/soc/mediatek/mtk-mutex.c | 113 +-
drivers/soc/mediatek/mtk-pm-domains.c | 13 +
drivers/soc/mediatek/mtk-pm-domains.h | 5 +
drivers/soc/mediatek/mtk-regulator-coupler.c | 159 +++
drivers/soc/mediatek/mtk-svs.c | 155 ++-
drivers/soc/nuvoton/Kconfig | 11 +
drivers/soc/nuvoton/Makefile | 2 +
drivers/soc/nuvoton/wpcm450-soc.c | 109 ++
drivers/soc/qcom/Kconfig | 27 +
drivers/soc/qcom/Makefile | 3 +
drivers/soc/qcom/mdt_loader.c | 2 +-
drivers/soc/qcom/ocmem.c | 2 +-
drivers/soc/qcom/pmic_glink.c | 336 +++++
drivers/soc/qcom/pmic_glink_altmode.c | 478 +++++++
drivers/soc/qcom/qcom_stats.c | 10 +-
drivers/soc/qcom/ramp_controller.c | 343 +++++
drivers/soc/qcom/rmtfs_mem.c | 31 +-
drivers/soc/qcom/rpmhpd.c | 34 +
drivers/soc/qcom/rpmpd.c | 18 -
drivers/soc/qcom/smd-rpm.c | 1 +
drivers/soc/qcom/socinfo.c | 112 +-
drivers/soc/renesas/Kconfig | 4 +
drivers/soc/renesas/Makefile | 1 +
drivers/soc/renesas/pwc-rzv2m.c | 141 ++
drivers/soc/renesas/r8a779g0-sysc.c | 1 +
drivers/soc/sifive/Kconfig | 2 +-
drivers/soc/starfive/Kconfig | 12 +
drivers/soc/starfive/Makefile | 3 +
drivers/soc/starfive/jh71xx_pmu.c | 383 ++++++
drivers/soc/sunxi/Kconfig | 9 +
drivers/soc/sunxi/Makefile | 1 +
drivers/soc/sunxi/sun20i-ppu.c | 207 +++
drivers/soc/sunxi/sunxi_sram.c | 3 +
drivers/soc/xilinx/xlnx_event_manager.c | 4 +-
drivers/soc/xilinx/zynqmp_pm_domains.c | 2 +-
drivers/spi/spi-rpc-if.c | 14 +-
drivers/thermal/qcom/lmh.c | 2 +-
drivers/ufs/host/ufs-qcom-ice.c | 2 +-
fs/debugfs/file.c | 1 +
fs/fuse/cuse.c | 2 +-
fs/fuse/dev.c | 4 +-
fs/fuse/dir.c | 126 +-
fs/fuse/file.c | 91 +-
fs/fuse/fuse_i.h | 9 +-
fs/fuse/inode.c | 4 +-
fs/fuse/ioctl.c | 6 +
include/dt-bindings/arm/qcom,ids.h | 83 ++
include/dt-bindings/firmware/qcom,scm.h | 16 +
.../dt-bindings/power/allwinner,sun20i-d1-ppu.h | 10 +
include/dt-bindings/power/mediatek,mt8188-power.h | 44 +
include/dt-bindings/power/qcom-rpmpd.h | 30 +-
include/dt-bindings/power/r8a779g0-sysc.h | 1 +
include/dt-bindings/power/starfive,jh7110-pmu.h | 17 +
include/dt-bindings/reset/mt8195-resets.h | 45 +
include/linux/{ => firmware/qcom}/qcom_scm.h | 6 +-
include/linux/firmware/xlnx-zynqmp.h | 4 +
include/linux/mmc/host.h | 1 +
include/linux/mmc/slot-gpio.h | 1 +
include/linux/scmi_protocol.h | 5 -
include/linux/soc/apple/rtkit.h | 26 +
include/linux/soc/mediatek/infracfg.h | 121 ++
include/linux/soc/mediatek/mtk-mmsys.h | 25 +
include/linux/soc/qcom/apr.h | 2 +-
include/linux/soc/qcom/pmic_glink.h | 32 +
include/linux/swiotlb.h | 5 -
include/memory/renesas-rpc-if.h | 34 +-
include/trace/events/scmi.h | 18 +-
include/uapi/linux/fuse.h | 45 +-
kernel/dma/swiotlb.c | 11 +-
mm/memblock.c | 41 +-
sound/soc/qcom/qdsp6/q6core.c | 4 +-
236 files changed, 11258 insertions(+), 1692 deletions(-)
create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc
create mode 100644 Documentation/ABI/testing/debugfs-scmi
create mode 100644 Documentation/ABI/testing/debugfs-scmi-raw
create mode 100644 Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml
delete mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt
create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml
delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt
create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml
delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt
create mode 100644 Documentation/devicetree/bindings/mmc/starfive,jh7110-mmc.yaml
create mode 100644 Documentation/devicetree/bindings/power/allwinner,sun20i-d1-ppu.yaml
create mode 100644 Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml
create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml
delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt
create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml
create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml
create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml
create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml
create mode 100644 drivers/firmware/arm_scmi/raw_mode.c
create mode 100644 drivers/firmware/arm_scmi/raw_mode.h
create mode 100644 drivers/mmc/host/dw_mmc-starfive.c
create mode 100644 drivers/power/supply/qcom_battmgr.c
create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h
create mode 100644 drivers/soc/mediatek/mt8188-pm-domains.h
create mode 100644 drivers/soc/mediatek/mtk-regulator-coupler.c
create mode 100644 drivers/soc/nuvoton/Kconfig
create mode 100644 drivers/soc/nuvoton/Makefile
create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c
create mode 100644 drivers/soc/qcom/pmic_glink.c
create mode 100644 drivers/soc/qcom/pmic_glink_altmode.c
create mode 100644 drivers/soc/qcom/ramp_controller.c
create mode 100644 drivers/soc/renesas/pwc-rzv2m.c
create mode 100644 drivers/soc/starfive/Kconfig
create mode 100644 drivers/soc/starfive/Makefile
create mode 100644 drivers/soc/starfive/jh71xx_pmu.c
create mode 100644 drivers/soc/sunxi/sun20i-ppu.c
create mode 100644 include/dt-bindings/firmware/qcom,scm.h
create mode 100644 include/dt-bindings/power/allwinner,sun20i-d1-ppu.h
create mode 100644 include/dt-bindings/power/mediatek,mt8188-power.h
create mode 100644 include/dt-bindings/power/starfive,jh7110-pmu.h
rename include/linux/{ => firmware/qcom}/qcom_scm.h (96%)
create mode 100644 include/linux/soc/qcom/pmic_glink.h
Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes
Already up to date.
Merging mm-hotfixes/mm-hotfixes-unstable (bea7737660dc fs/cramfs/inode.c: initialize file_ra_state)
df533767b904 ("mm/mprotect: Fix successful vma_merge() of next in do_mprotect_pkey()")
$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable
Merge made by the 'ort' strategy.
.mailmap | 1 +
arch/x86/include/asm/string_64.h | 19 -----
fs/cramfs/inode.c | 2 +-
fs/hfsplus/super.c | 4 +-
fs/ocfs2/move_extents.c | 34 +++-----
include/linux/rmap.h | 2 +-
kernel/panic.c | 44 ++++++-----
lib/Kconfig.kasan | 9 +++
lib/parser.c | 14 ++--
lib/zlib_deflate/defutil.h | 4 +-
mm/damon/paddr.c | 7 +-
mm/kasan/Makefile | 9 ++-
mm/kasan/kasan.h | 4 +
mm/kasan/kasan_test.c | 29 +++++++
mm/kasan/shadow.c | 16 +++-
mm/memory-failure.c | 8 +-
mm/migrate.c | 167 +++++++++++++++++++--------------------
mm/mmap.c | 2 +-
mm/rmap.c | 2 +-
scripts/Makefile.kasan | 17 ++++
20 files changed, 227 insertions(+), 167 deletions(-)
Merging kbuild-current/fixes (22e46f6480e8 kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes
Already up to date.
Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3)
$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr
Already up to date.
Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it)
$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
Already up to date.
Merging arm64-fixes/for-next/fixes (853e2dac25c1 arm64: perf: reject CHAIN events at creation time)
$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes
Already up to date.
Merging arm-soc-fixes/arm/fixes (9f79762ef8d9 Merge tag 'samsung-dt-fixes-6.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes)
$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes
Already up to date.
Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current
Already up to date.
Merging drivers-memory-fixes/fixes (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe())
$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes
Already up to date.
Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes
Already up to date.
Merging m68k-current/for-linus (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus
Already up to date.
Merging powerpc-fixes/fixes (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes
Already up to date.
Merging s390-fixes/fixes (f3dd0c53370e bpf: add missing header file include)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Already up to date.
Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master
Auto-merging arch/sparc/mm/srmmu.c
Merge made by the 'ort' strategy.
Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current
Already up to date.
Merging fsverity-current/for-current (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork)
$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current
Already up to date.
Merging net/main (580f98cc33a2 tcp: tcp_check_req() can be called from process context)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
Merge made by the 'ort' strategy.
Documentation/netlink/specs/netdev.yaml | 2 +-
Documentation/networking/msg_zerocopy.rst | 6 +-
drivers/mfd/ocelot-core.c | 2 +-
drivers/net/dsa/ocelot/felix_vsc9959.c | 2 +-
drivers/net/dsa/ocelot/ocelot_ext.c | 3 +-
drivers/net/dsa/ocelot/seville_vsc9953.c | 4 +-
drivers/net/ethernet/ibm/ibmvnic.c | 4 +-
drivers/net/ethernet/intel/Kconfig | 4 +-
drivers/net/ethernet/intel/ice/Makefile | 2 +-
drivers/net/ethernet/intel/ice/ice_gnss.h | 4 +-
.../ethernet/marvell/octeontx2/nic/otx2_flows.c | 2 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 76 ++++++++++++-----
drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 4 +
drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 25 +++++-
.../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 +-
.../ethernet/mellanox/mlx5/core/en/tc/act_stats.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 +
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 59 -------------
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +-
.../net/ethernet/mellanox/mlx5/core/lib/geneve.c | 1 +
.../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 13 +--
drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 4 +
drivers/net/ethernet/qlogic/qede/qede_main.c | 21 ++---
drivers/net/ethernet/sun/sunhme.c | 6 +-
drivers/net/mdio/mdio-mscc-miim.c | 9 +-
drivers/net/phy/phy-c45.c | 56 ++++++++++---
drivers/net/phy/phy_device.c | 21 ++++-
drivers/net/wireless/ath/ath11k/pci.c | 2 +-
drivers/net/wireless/mediatek/mt76/usb.c | 1 +
drivers/net/xen-netback/netback.c | 5 --
drivers/nfc/st-nci/se.c | 6 ++
drivers/nfc/st21nfca/se.c | 6 ++
drivers/ptp/ptp_private.h | 2 +-
drivers/ptp/ptp_vclock.c | 44 +++++-----
include/linux/mdio/mdio-mscc-miim.h | 2 +-
include/linux/netfilter.h | 5 ++
include/linux/phy.h | 6 ++
include/net/netns/conntrack.h | 1 -
include/net/sctp/structs.h | 1 +
include/uapi/linux/netdev.h | 2 +-
net/bridge/netfilter/ebtables.c | 2 +-
net/core/dev.c | 4 +-
net/ipv4/netfilter/arp_tables.c | 4 +
net/ipv4/netfilter/ip_tables.c | 7 +-
net/ipv4/tcp_minisocks.c | 7 +-
net/ipv6/netfilter/ip6_tables.c | 7 +-
net/ipv6/netfilter/ip6t_rpfilter.c | 4 +-
net/ipv6/route.c | 11 +--
net/netfilter/core.c | 3 +
net/netfilter/nf_conntrack_bpf.c | 1 -
net/netfilter/nf_conntrack_core.c | 25 +++---
net/netfilter/nf_conntrack_ecache.c | 2 +-
net/netfilter/nf_conntrack_netlink.c | 8 +-
net/netfilter/nf_tables_api.c | 2 +-
net/netfilter/nfnetlink.c | 9 +-
net/netfilter/xt_length.c | 3 +-
net/nfc/netlink.c | 4 +
net/sched/act_api.c | 4 +-
net/sched/act_mpls.c | 66 ++++++++-------
net/sched/act_pedit.c | 58 +++++++------
net/sched/act_sample.c | 11 ++-
net/sched/cls_api.c | 2 +-
net/sctp/stream_sched_prio.c | 52 +++++-------
net/wireless/wext-core.c | 4 +-
tools/include/uapi/linux/netdev.h | 2 +-
tools/net/ynl/lib/.gitignore | 1 +
tools/net/ynl/lib/nlspec.py | 4 +-
tools/net/ynl/ynl-gen-c.py | 2 +-
tools/testing/selftests/net/fib_tests.sh | 96 +++++++++++++++++++++-
tools/testing/selftests/netfilter/rpath.sh | 32 ++++++--
72 files changed, 546 insertions(+), 318 deletions(-)
create mode 100644 tools/net/ynl/lib/.gitignore
Merging bpf/master (2d311f480b52 riscv, bpf: Fix patch_text implicit declaration)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
Merge made by the 'ort' strategy.
Documentation/bpf/bpf_devel_QA.rst | 3 +--
arch/riscv/net/bpf_jit_comp64.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
Merging ipsec/master (c276a706ea1f xfrm: Allow transport-mode states with AF_UNSPEC selector)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Auto-merging net/xfrm/xfrm_state.c
Merge made by the 'ort' strategy.
net/xfrm/xfrm_state.c | 5 -----
net/xfrm/xfrm_user.c | 45 +++++++++++++++++++++++++++++++++++++++++----
2 files changed, 41 insertions(+), 9 deletions(-)
Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master
Already up to date.
Merging ipvs/master (fd2a55e74a99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master
Already up to date.
Merging wireless/for-next (52fd90638a72 wifi: wext: warn about usage only once)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Already up to date.
Merging rdma-fixes/for-rc (ceaa837f96ad Linux 6.2-rc8)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc
Already up to date.
Merging sound-current/for-linus (e97fc9cffbb9 Merge tag 'asoc-fix-v6.2-rc8-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Already up to date.
Merging sound-asoc-fixes/for-linus (54bc59d18178 Merge remote-tracking branch 'asoc/for-6.2' into asoc-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus
Merge made by the 'ort' strategy.
.../devicetree/bindings/sound/apple,mca.yaml | 1 +
sound/soc/amd/yc/acp6x-mach.c | 7 +++
sound/soc/apple/mca.c | 31 ++++++++---
sound/soc/codecs/adau7118.c | 19 +------
sound/soc/codecs/da7219-aad.c | 41 +++++++++++---
sound/soc/codecs/da7219-aad.h | 4 ++
sound/soc/codecs/sma1303.c | 2 +-
sound/soc/intel/boards/sof_rt5682.c | 23 ++++++++
sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 12 ++++
sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 8 ---
sound/soc/sh/rcar/adg.c | 64 +++++++++++-----------
11 files changed, 138 insertions(+), 74 deletions(-)
Merging regmap-fixes/for-linus (697c3892d825 regmap: apply reg_base and reg_downshift for single register ops)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus
Already up to date.
Merging regulator-fixes/for-linus (c361e8d45e52 Merge remote-tracking branch 'regulator/for-6.2' into regulator-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Merge made by the 'ort' strategy.
drivers/regulator/core.c | 6 +++---
drivers/regulator/max597x-regulator.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
Merging spi-fixes/for-linus (4822fc06d054 Merge remote-tracking branch 'spi/for-6.2' into spi-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus
Merge made by the 'ort' strategy.
drivers/spi/spi-cadence-quadspi.c | 2 +-
drivers/spi/spi-sn-f-ospi.c | 2 +-
drivers/spi/spi-tegra210-quad.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
Merging pci-current/for-linus (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
Already up to date.
Merging driver-core.current/driver-core-linus (0c058fb94ae0 driver core: fw_devlink: Print full path and name of fwnode)
$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus
Merge made by the 'ort' strategy.
drivers/base/bus.c | 2 +-
drivers/base/core.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
Merging tty.current/tty-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus
Already up to date.
Merging usb.current/usb-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
Already up to date.
Merging usb-serial-fixes/usb-linus (4ec5183ec486 Linux 6.2-rc7)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus
Already up to date.
Merging phy/fixes (2241ab53cbb5 Linux 6.2-rc5)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
Already up to date.
Merging staging.current/staging-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus
Already up to date.
Merging iio-fixes/fixes-togreg (03fada47311a iio: accel: kionix-kx022a: Get the timestamp from the driver's private data in the trigger_handler)
$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
Auto-merging drivers/iio/adc/qcom-spmi-adc5.c
Auto-merging drivers/iio/light/vcnl4000.c
Merge made by the 'ort' strategy.
drivers/iio/accel/kionix-kx022a.c | 2 +-
drivers/iio/adc/ad7791.c | 2 +-
drivers/iio/adc/ltc2497.c | 6 ++----
drivers/iio/adc/qcom-spmi-adc5.c | 10 +++++++++-
drivers/iio/imu/Kconfig | 1 +
drivers/iio/industrialio-buffer.c | 21 ++++++++++++---------
drivers/iio/light/vcnl4000.c | 3 ++-
7 files changed, 28 insertions(+), 17 deletions(-)
Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current
Already up to date.
Merging char-misc.current/char-misc-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus
Already up to date.
Merging soundwire-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
Already up to date.
Merging thunderbolt-fixes/fixes (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes
Already up to date.
Merging input-current/for-linus (7ae9fb1b7ecb Merge branch 'next' into for-linus)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Already up to date.
Merging crypto-current/master (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master
Already up to date.
Merging vfio-fixes/for-linus (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock)
$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus
Already up to date.
Merging kselftest-fixes/fixes (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes
Already up to date.
Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition)
$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus
Already up to date.
Merging dmaengine-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
Already up to date.
Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes
Already up to date.
Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus)
$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Already up to date.
Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes
Already up to date.
Merging v4l-dvb-fixes/fixes (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use)
$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref)
$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
Already up to date.
Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes
Already up to date.
Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60)
$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes
Already up to date.
Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
Already up to date.
Merging kvm-fixes/master (2c10b61421a2 kvm: initialize all of the kvm_debugregs structure before sending it to userspace)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master
Already up to date.
Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master
Already up to date.
Merging hwmon-fixes/hwmon (58326709e8f8 hwmon: (nzxt-smart2) add another USB ID)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Merge made by the 'ort' strategy.
drivers/hwmon/adt7475.c | 8 ++++----
drivers/hwmon/nzxt-smart2.c | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE)
$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes
Already up to date.
Merging cxl-fixes/fixes (711442e29f16 cxl/region: Fix passthrough-decoder detection)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes
Already up to date.
Merging btrfs-fixes/next-fixes (000f66519f1a Merge branch 'misc-6.2' into next-fixes)
$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes
Merge made by the 'ort' strategy.
Merging vfs-fixes/fixes (cd2dbcc75947 sparc: fix livelock in uaccess)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
Auto-merging arch/riscv/mm/fault.c
Merge made by the 'ort' strategy.
arch/alpha/mm/fault.c | 5 ++++-
arch/hexagon/mm/vm_fault.c | 5 ++++-
arch/ia64/mm/fault.c | 5 ++++-
arch/m68k/mm/fault.c | 5 ++++-
arch/microblaze/mm/fault.c | 5 ++++-
arch/nios2/mm/fault.c | 5 ++++-
arch/openrisc/mm/fault.c | 5 ++++-
arch/parisc/mm/fault.c | 5 ++++-
arch/riscv/mm/fault.c | 5 ++++-
arch/sparc/mm/fault_32.c | 5 ++++-
arch/sparc/mm/fault_64.c | 7 ++++++-
11 files changed, 46 insertions(+), 11 deletions(-)
Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted())
$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus
Already up to date.
Merging drivers-x86-fixes/fixes (eb4b55f2f26f platform/x86/intel/vsec: Add support for Meteor Lake)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes
Already up to date.
Merging samsung-krzk-fixes/fixes (a3583e92d188 ARM: dts: exynos: correct TMU phandle in Odroid XU3 family)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes
Already up to date.
Merging pinctrl-samsung-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes
Already up to date.
Merging devicetree-fixes/dt/linus (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property)
$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus
Already up to date.
Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes
Already up to date.
Merging scsi-fixes/fixes (15600159bcc6 scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT")
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes
Already up to date.
Merging drm-fixes/drm-fixes (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes
Already up to date.
Merging drm-intel-fixes/for-linux-next-fixes (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
Already up to date.
Merging mmc-fixes/fixes (3f18c5046e63 mmc: jz4740: Work around bug on JZ4760(B))
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Already up to date.
Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource)
$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes
Already up to date.
Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus
Already up to date.
Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register())
$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
Already up to date.
Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18)
$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix
Already up to date.
Merging risc-v-fixes/fixes (950b879b7f02 riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Already up to date.
Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory)
$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes
Already up to date.
Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests)
$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes
Merge made by the 'ort' strategy.
drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++
1 file changed, 6 insertions(+)
Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes
Already up to date.
Merging spdx/spdx-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus
Already up to date.
Merging gpio-brgl-fixes/gpio/for-current (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current
Already up to date.
Merging gpio-intel-fixes/fixes (a69982c37cd0 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NH5xAx)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes
Already up to date.
Merging pinctrl-intel-fixes/fixes (ceaa837f96ad Linux 6.2-rc8)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes
Already up to date.
Merging erofs-fixes/fixes (e02ac3e7329f erofs: clean up parsing of fscache related options)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes
Already up to date.
Merging kunit-fixes/kunit-fixes (254c71374a70 kunit: fix kunit_test_init_section_suites(...))
$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes
Already up to date.
Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes
Already up to date.
Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().")
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes
Already up to date.
Merging nfsd-fixes/nfsd-fixes (4102db175b5d nfsd: don't destroy global nfs4_file table in per-net shutdown)
$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes
Already up to date.
Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC)
$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes
Already up to date.
Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes
Already up to date.
Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1)
$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes
Already up to date.
Merging perf-current/perf/urgent (3ef9fec011d4 tools arch x86: Sync the msr-index.h copy with the kernel sources)
$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent
Merge made by the 'ort' strategy.
tools/arch/x86/include/asm/msr-index.h | 20 ++++++++++++++++++++
tools/perf/util/bpf_skel/off_cpu.bpf.c | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
Merging efi-fixes/urgent (190233164cd7 arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines)
$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Already up to date.
Merging zstd-fixes/zstd-linus (7f18d6eececb lib: zstd: Backport fix for in-place decompression)
$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
Merge made by the 'ort' strategy.
lib/zstd/decompress/huf_decompress.c | 2 +-
lib/zstd/decompress/zstd_decompress.c | 25 ++++++++++++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes
Merge made by the 'ort' strategy.
drivers/power/supply/axp288_fuel_gauge.c | 2 ++
drivers/power/supply/cros_usbpd-charger.c | 2 +-
drivers/power/supply/rk817_charger.c | 4 ----
3 files changed, 3 insertions(+), 5 deletions(-)
Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes
Already up to date.
Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1)
$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes
Already up to date.
Merging iommufd-fixes/for-rc (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc
Already up to date.
Merging rust-fixes/rust-fixes (2a02b7a19794 rust: kernel: Mark rust_fmt_argument as extern "C")
$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
Merge made by the 'ort' strategy.
rust/kernel/print.rs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Merging drm-misc-fixes/for-linux-next-fixes (ba3be66f11c3 drm/panfrost: Don't sync rpm suspension after mmu flushing)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
Auto-merging drivers/gpu/drm/drm_gem.c
Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c
Auto-merging drivers/gpu/drm/tiny/cirrus.c
Auto-merging drivers/gpu/drm/virtio/virtgpu_vq.c
Auto-merging include/drm/drm_gem.h
Merge made by the 'ort' strategy.
drivers/gpu/drm/drm_gem.c | 9 ++++--
drivers/gpu/drm/drm_gem_shmem_helper.c | 9 ++++--
drivers/gpu/drm/msm/msm_gem_shrinker.c | 11 +++++--
drivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 +--
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 3 +-
drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 8 +++--
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 21 +++++-------
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 41 ++++++++----------------
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 4 +--
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 3 +-
drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c | 4 +--
drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +-
drivers/gpu/drm/tiny/cirrus.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +--
include/drm/drm_gem.h | 4 ++-
16 files changed, 68 insertions(+), 64 deletions(-)
Merging mm-stable/mm-stable (4b7c7c73689d dmapool: create/destroy cleanup)
$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
Merge made by the 'ort' strategy.
mm/Kconfig | 9 ++++
mm/Makefile | 1 +
mm/dmapool_test.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 157 insertions(+)
create mode 100644 mm/dmapool_test.c
Merging mm-nonmm-stable/mm-nonmm-stable (21baac5614dc Kconfig.debug: fix SCHED_DEBUG dependency)
$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable
Merge made by the 'ort' strategy.
lib/Kconfig.debug | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging mm/mm-everything (b15715cac1a9 Merge branch 'mm-nonmm-unstable' into mm-everything)
$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-kernel-mm-ksm | 8 +
Documentation/accounting/delay-accounting.rst | 14 +-
Documentation/admin-guide/blockdev/zram.rst | 1 +
Documentation/admin-guide/mm/ksm.rst | 15 +-
Documentation/core-api/printk-formats.rst | 16 +-
Documentation/mm/active_mm.rst | 6 +
Documentation/mm/multigen_lru.rst | 44 ++-
.../zh_CN/accounting/delay-accounting.rst | 10 +-
MAINTAINERS | 1 +
arch/Kconfig | 32 ++
arch/arm/mach-rpc/ecard.c | 2 +-
arch/ia64/kernel/salinfo.c | 2 +-
arch/ia64/mm/contig.c | 2 +-
arch/powerpc/Kconfig | 1 +
arch/powerpc/kernel/smp.c | 2 +-
arch/powerpc/mm/book3s64/radix_tlb.c | 4 +-
arch/x86/mm/pat/memtype.c | 12 +-
drivers/block/zram/zram_drv.c | 5 +-
fs/exec.c | 2 +-
fs/proc/base.c | 7 +-
fs/proc/generic.c | 1 -
fs/proc/proc_sysctl.c | 1 -
include/linux/ksm.h | 19 +-
include/linux/mm_types.h | 7 +-
include/linux/mmzone.h | 2 +-
include/linux/page-flags.h | 7 +-
include/linux/pgtable.h | 7 +-
include/linux/sched/coredump.h | 1 +
include/linux/sched/mm.h | 28 ++
include/linux/zsmalloc.h | 2 +
include/trace/events/huge_memory.h | 3 +-
include/trace/events/ksm.h | 251 ++++++++++++++
include/trace/events/mmflags.h | 93 +++---
include/uapi/linux/prctl.h | 2 +
kernel/cpu.c | 2 +-
kernel/exit.c | 2 +-
kernel/fork.c | 65 ++++
kernel/kthread.c | 22 +-
kernel/sched/core.c | 15 +-
kernel/sys.c | 29 ++
lib/Kconfig.debug | 10 +
lib/test_printf.c | 26 ++
lib/vsprintf.c | 21 ++
mm/cma_sysfs.c | 2 +-
mm/debug.c | 7 +
mm/fadvise.c | 11 +-
mm/hugetlb_vmemmap.c | 14 +-
mm/internal.h | 22 ++
mm/khugepaged.c | 266 ++++++++++-----
mm/ksm.c | 320 +++++++++++++++---
mm/memory.c | 1 +
mm/mremap.c | 2 +-
mm/page_alloc.c | 175 +++-------
mm/shmem.c | 116 +++++++
mm/userfaultfd.c | 41 ++-
mm/vmscan.c | 24 +-
mm/zsmalloc.c | 365 ++++++++++-----------
mm/zswap.c | 16 +-
tools/accounting/getdelays.c | 24 +-
tools/include/uapi/linux/prctl.h | 2 +
tools/testing/selftests/mm/Makefile | 2 +-
tools/testing/selftests/mm/ksm_functional_tests.c | 96 +++++-
tools/testing/selftests/mm/ksm_tests.c | 254 +++++++++++---
63 files changed, 1915 insertions(+), 647 deletions(-)
create mode 100644 include/trace/events/ksm.h
Merging kbuild/for-next (7adf14d8aca1 kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_install)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Already up to date.
Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros)
$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format
Already up to date.
Merging perf/perf/core (f9fa0778ee73 perf tests stat_all_metrics: Change true workload to sleep workload for system wide check)
$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core
Already up to date.
Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute)
$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes
Auto-merging include/linux/compiler_attributes.h
Merge made by the 'ort' strategy.
include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
Merging dma-mapping/for-next (9b07d27d0fbb swiotlb: mark swiotlb_memblock_alloc() as __init)
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next
Already up to date.
Merging asm-generic/master (a13408c20526 char/agp: introduce asm-generic/agp.h)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master
Already up to date.
Merging arc/for-next (f2906aa86338 Linux 5.19-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next
Already up to date.
Merging arm/for-next (ba07b4efc989 Merge branches 'misc' and 'fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next
Merge made by the 'ort' strategy.
Merging arm64/for-next/core (1b561d3949f8 arm64: acpi: Fix possible memory leak of ffh_ctxt)
$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm64/kernel/fpsimd.c
Auto-merging arch/arm64/kernel/traps.c
Merge made by the 'ort' strategy.
arch/arm64/Kconfig | 1 -
arch/arm64/kernel/acpi.c | 8 ++++----
arch/arm64/kernel/fpsimd.c | 3 ---
arch/arm64/kernel/traps.c | 2 +-
arch/arm64/mm/copypage.c | 3 ++-
5 files changed, 7 insertions(+), 10 deletions(-)
Merging arm-perf/for-next/perf (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected)
$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf
Already up to date.
Merging arm-soc/for-next (519a0ceec9b0 soc: document merges)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next
Merge made by the 'ort' strategy.
arch/arm/arm-soc-for-next-contents.txt | 68 ++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging amlogic/for-next (b6520fc7ee57 Merge branch 'v6.2/fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next
Merge made by the 'ort' strategy.
Merging asahi-soc/asahi-soc/for-next (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog)
$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next
Already up to date.
Merging aspeed/for-next (52dfcf784bbf soc: nuvoton: Add SoC info driver for WPCM450)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next
Auto-merging drivers/soc/Kconfig
Auto-merging drivers/soc/Makefile
Merge made by the 'ort' strategy.
Merging at91/at91-next (05ccf9c9c2fc Merge branch 'at91-dt' into at91-next)
$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next
Merge made by the 'ort' strategy.
Merging broadcom/next (b691373a1bec Merge branch 'devicetree/next' into next)
$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next
Merge made by the 'ort' strategy.
arch/arm/boot/dts/bcm47622.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm63138.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm63148.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm63178.dtsi | 19 +++++++++++++++++++
arch/arm/boot/dts/bcm6756.dtsi | 19 +++++++++++++++++++
arch/arm/boot/dts/bcm6846.dtsi | 18 ++++++++++++++++++
arch/arm/boot/dts/bcm6855.dtsi | 19 +++++++++++++++++++
arch/arm/boot/dts/bcm6878.dtsi | 19 +++++++++++++++++++
arch/arm/boot/dts/bcm947622.dts | 4 ++++
arch/arm/boot/dts/bcm963138.dts | 4 ++++
arch/arm/boot/dts/bcm963138dvt.dts | 4 ++++
arch/arm/boot/dts/bcm963148.dts | 4 ++++
arch/arm/boot/dts/bcm963178.dts | 4 ++++
arch/arm/boot/dts/bcm96756.dts | 4 ++++
arch/arm/boot/dts/bcm96846.dts | 4 ++++
arch/arm/boot/dts/bcm96855.dts | 4 ++++
arch/arm/boot/dts/bcm96878.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 ++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 ++++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 +++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 +++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 ++++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 ++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 ++++++++++++++++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 ++++
arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 ++++
arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +-
drivers/bus/brcmstb_gisb.c | 4 +---
33 files changed, 346 insertions(+), 4 deletions(-)
Merging davinci/davinci/for-next (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next
Already up to date.
Merging drivers-memory/for-next (957b573ea840 Merge branch 'mem-ctrl-next' into for-next)
$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next
Merge made by the 'ort' strategy.
Merging imx-mxs/for-next (fd5368f6f08b Merge branch 'imx/defconfig' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next
Merge made by the 'ort' strategy.
Merging mediatek/for-next (74ba8bb2bfb2 Merge branch 'v6.2-next/soc' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next
Merge made by the 'ort' strategy.
Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' into mvebu/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next
Merge made by the 'ort' strategy.
Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next
Merge made by the 'ort' strategy.
Merging qcom/for-next (e34ca36eb310 Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next
Merge made by the 'ort' strategy.
Merging renesas/next (8dd3dae1705b Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' into renesas-next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next
Merge made by the 'ort' strategy.
Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next
Already up to date.
Merging rockchip/for-next (cc2b5be472c0 Merge branch 'v6.3-armsoc/dts32' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next
Merge made by the 'ort' strategy.
drivers/clk/rockchip/clk-rk3399.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging samsung-krzk/for-next (dd3d835d31ed Merge branch 'fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next
Merge made by the 'ort' strategy.
Merging scmi/for-linux-next (6d796c50f84c Linux 6.2-rc6)
$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next
Already up to date.
Merging stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32)
$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'ort' strategy.
Merging sunxi/sunxi/for-next (caea0128c038 Merge branch 'sunxi/dt-for-6.3' into sunxi/for-next)
$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next
Merge made by the 'ort' strategy.
Merging tee/next (816477edfba6 mm: Remove get_kernel_pages())
$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next
Already up to date.
Merging tegra/for-next (de98d45290c7 Merge branch for-6.3/arm64/dt into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next
Merge made by the 'ort' strategy.
Merging ti/ti-next (47d72bbb6c0f arm64: dts: ti: Makefile: Rearrange entries alphabetically)
$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next
Already up to date.
Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next)
$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next
Merge made by the 'ort' strategy.
Merging clk/clk-next (b64baafa24d2 Merge branches 'clk-loongson' and 'clk-qcom' into clk-next)
$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next
Already up to date.
Merging clk-imx/for-next (4e197ee880c2 clk: imx6ul: add ethernet refclock mux support)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next
Already up to date.
Merging clk-renesas/renesas-clk (b1dec4e78599 clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*)
$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk
Already up to date.
Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next
Already up to date.
Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment)
$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next
Already up to date.
Merging loongarch/loongarch-next (8883bf83127d selftests/ftrace: Add LoongArch kprobe args string tests support)
$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next
Auto-merging arch/loongarch/kernel/vmlinux.lds.S
Auto-merging include/uapi/linux/elf.h
Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c
Merge made by the 'ort' strategy.
arch/loongarch/Kconfig | 65 ++-
arch/loongarch/Makefile | 14 +-
arch/loongarch/configs/loongson3_defconfig | 1 +
arch/loongarch/include/asm/addrspace.h | 2 +
arch/loongarch/include/asm/asm.h | 10 +
arch/loongarch/include/asm/asmmacro.h | 17 +
arch/loongarch/include/asm/cpu.h | 2 +-
arch/loongarch/include/asm/hw_breakpoint.h | 145 ++++++
arch/loongarch/include/asm/inst.h | 58 +++
arch/loongarch/include/asm/kprobes.h | 61 +++
arch/loongarch/include/asm/loongarch.h | 35 +-
arch/loongarch/include/asm/processor.h | 16 +-
arch/loongarch/include/asm/ptrace.h | 39 ++
arch/loongarch/include/asm/setup.h | 16 +
arch/loongarch/include/asm/stackframe.h | 13 +-
arch/loongarch/include/asm/switch_to.h | 1 +
arch/loongarch/include/asm/uaccess.h | 1 -
arch/loongarch/include/uapi/asm/ptrace.h | 9 +
arch/loongarch/kernel/Makefile | 9 +-
arch/loongarch/kernel/entry.S | 91 ++--
arch/loongarch/kernel/ftrace_dyn.c | 64 +++
arch/loongarch/kernel/genex.S | 8 +-
arch/loongarch/kernel/head.S | 33 +-
arch/loongarch/kernel/hw_breakpoint.c | 548 +++++++++++++++++++++
arch/loongarch/kernel/inst.c | 123 +++++
arch/loongarch/kernel/kprobes.c | 406 +++++++++++++++
arch/loongarch/kernel/kprobes_trampoline.S | 96 ++++
arch/loongarch/kernel/process.c | 7 +
arch/loongarch/kernel/ptrace.c | 472 ++++++++++++++++++
arch/loongarch/kernel/relocate.c | 242 +++++++++
arch/loongarch/kernel/setup.c | 14 +-
arch/loongarch/kernel/time.c | 11 +-
arch/loongarch/kernel/traps.c | 68 ++-
arch/loongarch/kernel/vmlinux.lds.S | 20 +-
arch/loongarch/lib/memcpy.S | 3 +
arch/loongarch/lib/memmove.S | 4 +
arch/loongarch/lib/memset.S | 3 +
arch/loongarch/mm/fault.c | 3 +
arch/loongarch/mm/tlbex.S | 17 +-
arch/loongarch/power/suspend_asm.S | 5 +-
include/uapi/linux/elf.h | 2 +
samples/kprobes/kprobe_example.c | 8 +
.../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 +
tools/scripts/Makefile.arch | 11 +-
.../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 +
.../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 +
tools/testing/selftests/seccomp/seccomp_bpf.c | 6 +
47 files changed, 2665 insertions(+), 130 deletions(-)
create mode 100644 arch/loongarch/include/asm/hw_breakpoint.h
create mode 100644 arch/loongarch/include/asm/kprobes.h
create mode 100644 arch/loongarch/kernel/hw_breakpoint.c
create mode 100644 arch/loongarch/kernel/kprobes.c
create mode 100644 arch/loongarch/kernel/kprobes_trampoline.S
create mode 100644 arch/loongarch/kernel/relocate.c
create mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h
Merging m68k/for-next (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next
Already up to date.
Merging m68knommu/for-next (5aa52ccf692b m68k: nommu: Fix misspellings of "DragonEngine")
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next
Already up to date.
Merging microblaze/next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next
Already up to date.
Merging mips/mips-next (91dc288f4edf MIPS: vpe-mt: drop physical_memsize)
$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next
Already up to date.
Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc)
$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next
Already up to date.
Merging parisc-hd/for-next (3125e3b8f24c parisc: update kbuild doc. aliases for parisc64)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next
Auto-merging Documentation/kbuild/kbuild.rst
Auto-merging arch/Kconfig
Merge made by the 'ort' strategy.
Documentation/kbuild/kbuild.rst | 1 +
arch/Kconfig | 10 ++++++++++
arch/parisc/include/asm/cacheflush.h | 3 +++
arch/parisc/include/asm/kgdb.h | 2 ++
arch/parisc/kernel/cache.c | 7 ++++++-
fs/readdir.c | 18 ++++++++++++++++++
6 files changed, 40 insertions(+), 1 deletion(-)
Merging powerpc/next (f82cdc37c4bd powerpc/pseries: Avoid hcall in plpks_is_available() on non-pseries)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next
Already up to date.
Merging soc-fsl/next (4b0986a3613c Linux 5.18)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next
Already up to date.
Merging risc-v/for-next (eb9be8310c58 RISC-V: add a spin_shadow_stack declaration)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next
Already up to date.
Merging riscv-dt/riscv-dt-for-next (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM")
$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next
Already up to date.
Merging riscv-soc/riscv-soc-for-next (f3460326e38d Merge patch series "JH7110 PMU Support")
$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next
Already up to date.
Merging s390/for-next (ebf95e884694 s390/ap,zcrypt,vfio: introduce and use ap_queue_status_reg union)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next
Merge made by the 'ort' strategy.
arch/s390/include/asm/ap.h | 100 ++++++++++++++++++++------------------
arch/s390/kernel/early.c | 17 +++++++
arch/s390/kernel/nmi.c | 3 +-
drivers/s390/crypto/ap_queue.c | 2 +-
drivers/s390/crypto/vfio_ap_ops.c | 4 +-
5 files changed, 73 insertions(+), 53 deletions(-)
Merging sh/for-next (ff30bd6a6618 sh: clk: Fix clk_enable() to return 0 on NULL clk)
$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next
Merge made by the 'ort' strategy.
drivers/sh/clk/core.c | 2 +-
include/linux/sh_intc.h | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next
Auto-merging arch/x86/Makefile.um
Auto-merging fs/hostfs/hostfs_kern.c
Merge made by the 'ort' strategy.
Documentation/rust/arch-support.rst | 2 +
arch/um/Kconfig | 7 ++
arch/um/Makefile | 7 +-
arch/um/drivers/Kconfig | 2 +
arch/um/drivers/pcap_kern.c | 4 +-
arch/um/drivers/vector_kern.c | 1 +
arch/um/drivers/vector_user.h | 2 -
arch/um/drivers/virt-pci.c | 139 ++++++++++++++++++++++++++++++--
arch/um/drivers/virtio_uml.c | 20 ++++-
arch/um/include/asm/processor-generic.h | 2 +-
arch/um/kernel/exec.c | 4 +-
arch/um/kernel/tlb.c | 6 +-
arch/um/kernel/um_arch.c | 2 +-
arch/um/kernel/vmlinux.lds.S | 2 +-
arch/um/os-Linux/irq.c | 4 +-
arch/um/os-Linux/skas/mem.c | 19 ++---
arch/um/os-Linux/skas/process.c | 121 ++++++++++++++-------------
arch/x86/Makefile.um | 6 ++
arch/x86/um/vdso/Makefile | 2 +-
arch/x86/um/vdso/um_vdso.c | 12 ++-
fs/hostfs/hostfs_kern.c | 15 ++--
21 files changed, 268 insertions(+), 111 deletions(-)
Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct)
$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next
Already up to date.
Merging pidfd/for-next (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next
Already up to date.
Merging vfs-idmapping/for-next (9db35c4c2bc4 Merge branch 'fs.misc' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next
Merge made by the 'ort' strategy.
Merging fscrypt/for-next (097d7c1fcb8d fscrypt: clean up fscrypt_add_test_dummy_key())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next
Already up to date.
Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux)
$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next
Already up to date.
Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums)
$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next
Merge made by the 'ort' strategy.
include/trace/events/afs.h | 475 ++++++++++++++-------------------------------
1 file changed, 148 insertions(+), 327 deletions(-)
Merging btrfs/for-next (80d1eec6927a Merge branch 'for-next-current-v6.2-20230221' into for-next-20230221)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next
Merge made by the 'ort' strategy.
Merging ceph/master (f7c4d9b133c7 rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails)
$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master
Auto-merging drivers/block/rbd.c
Auto-merging fs/ceph/file.c
Merge made by the 'ort' strategy.
drivers/block/rbd.c | 20 +++++++++-----------
fs/ceph/file.c | 8 ++++++++
2 files changed, 17 insertions(+), 11 deletions(-)
Merging cifs/for-next (197662cdf755 cifs: improve checking of DFS links over STATUS_OBJECT_NAME_INVALID)
$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next
Merge made by the 'ort' strategy.
fs/cifs/cifsproto.h | 20 ++++++++++++----
fs/cifs/connect.c | 31 ++++---------------------
fs/cifs/file.c | 7 ++++++
fs/cifs/misc.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++
fs/cifs/smb2inode.c | 21 +++++++++--------
fs/cifs/smb2ops.c | 23 +++++++++++--------
fs/cifs/smbdirect.c | 2 +-
fs/netfs/iterator.c | 2 +-
8 files changed, 118 insertions(+), 54 deletions(-)
Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items)
$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next
Already up to date.
Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next
Auto-merging fs/ecryptfs/crypto.c
Merge made by the 'ort' strategy.
fs/ecryptfs/crypto.c | 8 ++++----
fs/ecryptfs/keystore.c | 2 +-
fs/ecryptfs/read_write.c | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
Merging erofs/dev (8d1b80a79452 erofs: fix an error code in z_erofs_init_zip_subsystem())
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev
Already up to date.
Merging exfat/dev (8258ef28001a exfat: handle unreconized benign secondary entries)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev
Auto-merging fs/exfat/exfat_fs.h
Auto-merging fs/exfat/file.c
Auto-merging fs/exfat/namei.c
Merge made by the 'ort' strategy.
fs/exfat/dir.c | 90 ++++++++++++++++++++++++++++++++++------------------
fs/exfat/exfat_fs.h | 4 ++-
fs/exfat/exfat_raw.h | 21 ++++++++++++
fs/exfat/file.c | 3 +-
fs/exfat/inode.c | 6 ++--
fs/exfat/namei.c | 2 +-
fs/exfat/super.c | 3 +-
7 files changed, 89 insertions(+), 40 deletions(-)
Merging ext3/for_next (90e4f9e49826 Pull udf fixup for syzbot allocation failure handling bug.)
$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next
Merge made by the 'ort' strategy.
Merging ext4/dev (2c2dec1e86cc ext4: fix incorrect options show of original mount_opt and extend mount_opt2)
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev
Auto-merging fs/ext4/ext4.h
Auto-merging fs/ext4/file.c
Auto-merging fs/ext4/inode.c
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Auto-merging fs/ext4/ioctl.c
Auto-merging fs/ext4/namei.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/xattr.c
Recorded preimage for 'fs/ext4/inode.c'
Automatic merge failed; fix conflicts and then commit the result.
$ git merge --abort
$ git diff -M --stat --summary HEAD^..
Merging f2fs/dev (ddf1eca4fc5a f2fs: drop unnecessary arg for f2fs_ioc_*())
$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev
Auto-merging MAINTAINERS
Auto-merging fs/f2fs/checkpoint.c
Auto-merging fs/f2fs/data.c
Auto-merging fs/f2fs/f2fs.h
Auto-merging fs/f2fs/file.c
CONFLICT (content): Merge conflict in fs/f2fs/file.c
Auto-merging fs/f2fs/namei.c
CONFLICT (content): Merge conflict in fs/f2fs/namei.c
Auto-merging fs/f2fs/node.c
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/verity.c
Resolved 'fs/f2fs/file.c' using previous resolution.
Resolved 'fs/f2fs/namei.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 15fb7aa13e89] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-fs-f2fs | 80 +++-
Documentation/filesystems/f2fs.rst | 2 +-
MAINTAINERS | 1 +
fs/f2fs/checkpoint.c | 37 +-
fs/f2fs/compress.c | 24 +-
fs/f2fs/data.c | 624 ++++++++++++++++----------------
fs/f2fs/debug.c | 64 +++-
fs/f2fs/dir.c | 4 +-
fs/f2fs/extent_cache.c | 60 ++-
fs/f2fs/f2fs.h | 128 +++----
fs/f2fs/file.c | 173 ++++-----
fs/f2fs/gc.c | 22 +-
fs/f2fs/gc.h | 2 +-
fs/f2fs/inline.c | 14 +-
fs/f2fs/inode.c | 78 ++--
fs/f2fs/iostat.c | 186 +++++-----
fs/f2fs/iostat.h | 19 +-
fs/f2fs/namei.c | 5 +-
fs/f2fs/node.c | 9 +-
fs/f2fs/segment.c | 225 ++++++------
fs/f2fs/segment.h | 41 ++-
fs/f2fs/super.c | 63 ++--
fs/f2fs/sysfs.c | 49 ++-
fs/f2fs/verity.c | 2 +-
include/linux/f2fs_fs.h | 2 +-
include/trace/events/f2fs.h | 104 ++++--
26 files changed, 1090 insertions(+), 928 deletions(-)
Merging fsverity/for-next (51e4e3153ebc fscrypt: support decrypting data from large folios)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next
Already up to date.
Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next
Already up to date.
Merging gfs2/for-next (c1b0c3cfcbad gfs2: Convert gfs2_page_add_databufs to folios)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next
Already up to date.
Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic)
$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next
Already up to date.
Merging ksmbd/ksmbd-for-next (25ac8c12ff78 Merge tag '6.3-rc-ksmbd-fixes' of git://git.samba.org/ksmbd)
$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next
Already up to date.
Merging nfs/linux-next (c9c3395d5e3d Linux 6.2)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next
Already up to date.
Merging nfs-anna/linux-next (1683ed16ff1a fs/nfs: Replace kmap_atomic() with kmap_local_page() in dir.c)
$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next
Already up to date.
Merging nfsd/nfsd-next (fb5b855d9f34 SUNRPC: Properly terminate test case arrays)
$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next
Merge made by the 'ort' strategy.
net/sunrpc/auth_gss/gss_krb5_test.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
Merging ntfs3/master (2024476646ed fs/ntfs3: Fix root inode checking)
$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master
Auto-merging fs/ntfs3/file.c
CONFLICT (content): Merge conflict in fs/ntfs3/file.c
Auto-merging fs/ntfs3/inode.c
CONFLICT (content): Merge conflict in fs/ntfs3/inode.c
Auto-merging fs/ntfs3/namei.c
Auto-merging fs/ntfs3/ntfs_fs.h
CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h
Auto-merging fs/ntfs3/xattr.c
CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c
Resolved 'fs/ntfs3/file.c' using previous resolution.
Resolved 'fs/ntfs3/inode.c' using previous resolution.
Resolved 'fs/ntfs3/ntfs_fs.h' using previous resolution.
Resolved 'fs/ntfs3/xattr.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 79ab4aedf7aa] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/ntfs3.rst | 11 --
fs/ntfs3/attrib.c | 17 +-
fs/ntfs3/bitmap.c | 25 +--
fs/ntfs3/file.c | 50 +++---
fs/ntfs3/frecord.c | 46 +++---
fs/ntfs3/fslog.c | 83 +++++-----
fs/ntfs3/fsntfs.c | 84 +++++-----
fs/ntfs3/index.c | 81 +++++++---
fs/ntfs3/inode.c | 134 +++++++++-------
fs/ntfs3/lznt.c | 10 +-
fs/ntfs3/namei.c | 19 ++-
fs/ntfs3/ntfs.h | 3 -
fs/ntfs3/ntfs_fs.h | 17 +-
fs/ntfs3/record.c | 15 +-
fs/ntfs3/run.c | 6 +-
fs/ntfs3/super.c | 312 +++++++++++++++++++++---------------
fs/ntfs3/xattr.c | 70 +++-----
17 files changed, 527 insertions(+), 456 deletions(-)
Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next
Already up to date.
Merging overlayfs/overlayfs-next (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up)
$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next
Already up to date.
Merging ubifs/next (8fcf2d012c86 ubi: block: Fix a possible use-after-free bug in ubiblock_create())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next
Auto-merging fs/jffs2/fs.c
Auto-merging fs/ubifs/dir.c
Auto-merging fs/ubifs/file.c
Auto-merging fs/ubifs/ubifs.h
Merge made by the 'ort' strategy.
drivers/mtd/ubi/block.c | 109 ++++++++++++++-----------------------------
drivers/mtd/ubi/build.c | 32 +++++++++++--
drivers/mtd/ubi/debug.c | 19 ++++----
drivers/mtd/ubi/eba.c | 2 +-
drivers/mtd/ubi/fastmap-wl.c | 12 +++--
drivers/mtd/ubi/fastmap.c | 2 +-
drivers/mtd/ubi/kapi.c | 1 +
drivers/mtd/ubi/misc.c | 2 +-
drivers/mtd/ubi/vmt.c | 18 +++----
drivers/mtd/ubi/wl.c | 27 +++++++++--
fs/jffs2/compr.c | 50 +++++++++++---------
fs/jffs2/compr.h | 26 ++++++++---
fs/jffs2/file.c | 15 +++---
fs/jffs2/fs.c | 2 +-
fs/ubifs/budget.c | 9 ++--
fs/ubifs/dir.c | 18 ++++++-
fs/ubifs/file.c | 31 ++++++++----
fs/ubifs/io.c | 6 +--
fs/ubifs/journal.c | 8 +++-
fs/ubifs/super.c | 17 +++++--
fs/ubifs/sysfs.c | 6 ++-
fs/ubifs/tnc.c | 24 +++++++++-
fs/ubifs/ubifs.h | 5 ++
include/linux/mtd/ubi.h | 1 +
24 files changed, 274 insertions(+), 168 deletions(-)
Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7)
$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next
Already up to date.
Merging v9fs-ericvh/ericvh/for-next (89c58cb395ec fs/9p: fix error reporting in v9fs_dir_release)
$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next
Auto-merging fs/9p/vfs_file.c
Auto-merging fs/9p/vfs_inode.c
Auto-merging fs/9p/vfs_inode_dotl.c
Auto-merging net/9p/trans_xen.c
Merge made by the 'ort' strategy.
fs/9p/v9fs.c | 2 +-
fs/9p/vfs_addr.c | 2 --
fs/9p/vfs_dir.c | 7 ++++---
fs/9p/vfs_file.c | 7 ++++---
fs/9p/vfs_inode.c | 3 +--
fs/9p/vfs_inode_dotl.c | 7 ++++---
net/9p/client.c | 8 ++++++--
net/9p/trans_rdma.c | 15 ++++++++++++---
net/9p/trans_xen.c | 48 +++++++++++++++++++++++++++++++-----------------
9 files changed, 63 insertions(+), 36 deletions(-)
Merging xfs/for-next (6e2985c938e8 xfs: restore old agirotor behavior)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next
Auto-merging fs/xfs/xfs_inode.c
Merge made by the 'ort' strategy.
fs/xfs/libxfs/xfs_ag.c | 93 ++++-
fs/xfs/libxfs/xfs_ag.h | 111 +++++-
fs/xfs/libxfs/xfs_ag_resv.c | 2 +-
fs/xfs/libxfs/xfs_alloc.c | 683 +++++++++++++++++++++++--------------
fs/xfs/libxfs/xfs_alloc.h | 61 ++--
fs/xfs/libxfs/xfs_alloc_btree.c | 2 +-
fs/xfs/libxfs/xfs_bmap.c | 664 +++++++++++++++++------------------
fs/xfs/libxfs/xfs_bmap.h | 7 +
fs/xfs/libxfs/xfs_bmap_btree.c | 64 ++--
fs/xfs/libxfs/xfs_btree.c | 2 +-
fs/xfs/libxfs/xfs_ialloc.c | 242 ++++++-------
fs/xfs/libxfs/xfs_ialloc.h | 5 +-
fs/xfs/libxfs/xfs_ialloc_btree.c | 47 ++-
fs/xfs/libxfs/xfs_ialloc_btree.h | 20 +-
fs/xfs/libxfs/xfs_refcount_btree.c | 10 +-
fs/xfs/libxfs/xfs_rmap_btree.c | 2 +-
fs/xfs/libxfs/xfs_sb.c | 3 +-
fs/xfs/scrub/agheader_repair.c | 35 +-
fs/xfs/scrub/bmap.c | 2 +-
fs/xfs/scrub/common.c | 21 +-
fs/xfs/scrub/fscounters.c | 13 +-
fs/xfs/scrub/repair.c | 7 +-
fs/xfs/xfs_bmap_util.c | 2 +-
fs/xfs/xfs_discard.c | 50 ++-
fs/xfs/xfs_filestream.c | 455 ++++++++++++------------
fs/xfs/xfs_filestream.h | 6 +-
fs/xfs/xfs_fsmap.c | 5 +-
fs/xfs/xfs_icache.c | 8 +-
fs/xfs/xfs_inode.c | 2 +-
fs/xfs/xfs_iwalk.c | 10 +-
fs/xfs/xfs_mount.h | 3 +-
fs/xfs/xfs_reflink.c | 4 +-
fs/xfs/xfs_super.c | 47 +--
fs/xfs/xfs_trace.h | 81 ++---
fs/xfs/xfs_trans.c | 8 +-
fs/xfs/xfs_trans.h | 2 +-
36 files changed, 1536 insertions(+), 1243 deletions(-)
Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next
Already up to date.
Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops)
$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next
Already up to date.
Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request)
$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next
Already up to date.
Merging file-locks/locks-next (eca3a04f140a Merge tag 'dlm-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next
Already up to date.
Merging iversion/iversion-next (eca3a04f140a Merge tag 'dlm-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next
Already up to date.
Merging vfs/for-next (e9f33f8668ab Merge branches 'work.misc', 'work.namespace', 'work.alpha', 'work.minix' and 'work.sysv' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next
Merge made by the 'ort' strategy.
Merging printk/for-next (10d639febe56 Merge branch 'for-6.3' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next
Merge made by the 'ort' strategy.
Merging pci/next (3eb5d0f26f4e Merge branch 'pci/misc')
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next
Already up to date.
Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore
Already up to date.
Merging hid/for-next (10635598711e Merge branch 'for-6.3/upstream-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next
Auto-merging drivers/hid/hid-core.c
Merge made by the 'ort' strategy.
drivers/hid/hid-core.c | 32 +++++++++++++++++++++++++-------
drivers/hid/hid-cp2112.c | 1 +
drivers/hid/uhid.c | 1 +
include/linux/hid.h | 3 +++
tools/testing/selftests/hid/config | 1 +
5 files changed, 31 insertions(+), 7 deletions(-)
Merging i2c/i2c/for-next (dc67b2d90438 Merge branch 'i2c/for-mergewindow' into i2c/for-next)
$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next
Merge made by the 'ort' strategy.
Merging i3c/i3c/next (07eac9c306a0 i3c: update dw-i3c-master i3c_clk_cfg function)
$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next
Auto-merging drivers/i3c/master.c
Merge made by the 'ort' strategy.
drivers/i3c/master.c | 1 +
drivers/i3c/master/dw-i3c-master.c | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks)
$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next
Already up to date.
Merging hwmon-staging/hwmon-next (58326709e8f8 hwmon: (nzxt-smart2) add another USB ID)
$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next
Already up to date.
Merging jc_docs/docs-next (27a6e6b25016 Merge branch 'docs-mw' into docs-next)
$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next
Auto-merging Documentation/process/submitting-patches.rst
Merge made by the 'ort' strategy.
Documentation/index.rst | 17 +++----
Documentation/locking/locktorture.rst | 4 +-
Documentation/process/5.Posting.rst | 3 +-
Documentation/process/submitting-patches.rst | 9 ++--
Documentation/translations/sp_SP/process/index.rst | 1 +
.../sp_SP/process/programming-language.rst | 53 ++++++++++++++++++++++
6 files changed, 72 insertions(+), 15 deletions(-)
create mode 100644 Documentation/translations/sp_SP/process/programming-language.rst
Merging v4l-dvb/master (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use)
$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master
Already up to date.
Merging v4l-dvb-next/master (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use)
$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master
Already up to date.
Merging pm/linux-next (243d50840e68 Merge branches 'pm-cpufreq' and 'powercap' into linux-next)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next
Merge made by the 'ort' strategy.
drivers/acpi/resource.c | 7 +++++++
drivers/cpufreq/amd-pstate.c | 3 +--
drivers/cpufreq/intel_pstate.c | 1 +
drivers/powercap/intel_rapl_msr.c | 2 ++
kernel/sched/cpufreq_schedutil.c | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
Merging cpufreq-arm/cpufreq/arm/linux-next (ba38f3cbe7db dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum)
$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next
Already up to date.
Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower
Already up to date.
Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU")
$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next
Merge made by the 'ort' strategy.
drivers/devfreq/Kconfig | 1 -
1 file changed, 1 deletion(-)
Merging opp/opp/linux-next (eca4c0eea534 OPP: fix error checking in opp_migrate_dentry())
$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next
Already up to date.
Merging thermal/thermal/linux-next (6828e402d06f thermal/drivers/st: Remove syscfg based driver)
$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next
Already up to date.
Merging dlm/next (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next
Already up to date.
Merging rdma/for-next (66fb1d5df6ac IB/mlx5: Extend debug control for CC parameters)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next
Already up to date.
Merging net-next/main (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main
Already up to date.
Merging bpf-next/for-next (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next
Already up to date.
Merging ipsec-next/master (75da437a2f17 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master
Already up to date.
Merging mlx5-next/mlx5-next (22551e77e550 net/mlx5: Configure IPsec steering for egress RoCEv2 traffic)
$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next
Already up to date.
Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master
Already up to date.
Merging ipvs-next/master (3fcdf2dfefb6 net: bcmgenet: Support wake-up from s2idle)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master
Already up to date.
Merging bluetooth/master (e16f2ec5cf3a Bluetooth: ISO: fix timestamped HCI ISO data packet parsing)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master
Merge made by the 'ort' strategy.
.../devicetree/bindings/net/marvell-bluetooth.yaml | 20 ++++-
drivers/bluetooth/btrtl.c | 10 +++
drivers/bluetooth/btusb.c | 20 +----
drivers/bluetooth/hci_mrvl.c | 90 +++++++++++++++++++---
include/net/bluetooth/hci_core.h | 2 +-
include/net/bluetooth/mgmt.h | 80 +++++++++----------
net/bluetooth/hci_core.c | 23 +++++-
net/bluetooth/hci_sync.c | 64 ++++++++++-----
net/bluetooth/iso.c | 9 ++-
9 files changed, 223 insertions(+), 95 deletions(-)
Merging wireless-next/for-next (38ae31922969 wifi: rtl8xxxu: add LEDS_CLASS dependency)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next
Already up to date.
Merging mtd/mtd/next (84549c816dc3 mtd: parsers: ofpart: add workaround for #size-cells 0)
$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next
Already up to date.
Merging nand/nand/next (ef3e6327ff04 mtd: rawnand: sunxi: Precompute the ECC_CTL register value)
$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next
Already up to date.
Merging spi-nor/spi-nor/next (f047382519ca Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next)
$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next
Already up to date.
Merging crypto/master (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master
Already up to date.
Merging drm/drm-next (a48bba98380c msm/fbdev: fix unused variable warning with clang.)
$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next
Already up to date.
Merging drm-misc/for-linux-next (e034b8a18d4b drm/msm: Fix possible uninitialized access in fbdev)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next
Auto-merging drivers/gpu/drm/msm/msm_fbdev.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/msm/msm_fbdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging amdgpu/drm-next (4f101d5710a8 drm/amd/display: Remove unused local variables and function)
$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_events.c
Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ++
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 23 ++-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 +
drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +-
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 83 ++++++---
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 +
drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 +
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +
drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 207 ++++++++++++++++++---
drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 26 +--
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +-
drivers/gpu/drm/amd/amdkfd/kfd_events.c | 9 +-
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 15 +-
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +-
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +-
drivers/gpu/drm/amd/display/Kconfig | 1 -
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +-
.../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 +-
.../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 3 +-
drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 7 -
.../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 -
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 2 -
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 4 -
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 -
drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 41 ----
.../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 5 +-
.../amd/display/dc/dcn32/dcn32_resource_helpers.c | 4 -
.../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 -
.../gpu/drm/amd/display/dc/link/link_detection.c | 2 +-
drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 +-
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 +-
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 4 +-
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 25 ++-
.../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 +
drivers/gpu/drm/radeon/atombios_encoders.c | 5 +-
include/uapi/drm/amdgpu_drm.h | 11 ++
47 files changed, 419 insertions(+), 210 deletions(-)
Merging drm-intel/for-linux-next (5d2fdb255c52 Merge tag 'gvt-next-fixes-2023-02-23' of https://github.com/intel/gvt-linux into drm-intel-next-fixes)
$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/Kconfig
Auto-merging drivers/gpu/drm/i915/gvt/firmware.c
Merge made by the 'ort' strategy.
drivers/gpu/drm/i915/Kconfig | 6 +++---
drivers/gpu/drm/i915/display/intel_quirks.c | 2 ++
drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 5 ++++-
drivers/gpu/drm/i915/gt/intel_ring.c | 6 +++---
drivers/gpu/drm/i915/gvt/debugfs.c | 16 ++++++++--------
drivers/gpu/drm/i915/gvt/firmware.c | 2 +-
drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
drivers/gpu/drm/i915/gvt/vgpu.c | 2 +-
8 files changed, 23 insertions(+), 18 deletions(-)
Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use)
$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next
Merge made by the 'ort' strategy.
drivers/gpu/host1x/dev.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Merging drm-msm/msm-next (dbd7a2a941b8 PM / devfreq: Fix build issues with devfreq disabled)
$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next
Already up to date.
Merging drm-msm-lumag/msm-next-lumag (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update())
$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag
Already up to date.
Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation)
$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next
Already up to date.
Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info)
$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next
Already up to date.
Merging fbdev/for-next (822242608545 fbdev: omapfb: cleanup inconsistent indentation)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next
Merge made by the 'ort' strategy.
drivers/video/fbdev/omap/omapfb_main.c | 30 +-
drivers/video/logo/pnmtologo.c | 674 ++++++++++++++++-----------------
2 files changed, 353 insertions(+), 351 deletions(-)
Merging regmap/for-next (40f4b0586810 Merge remote-tracking branch 'regmap/for-6.3' into regmap-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next
Already up to date.
Merging sound/for-next (7933b90b4289 Merge branch 'for-linus' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next
Already up to date.
Merging sound-asoc/for-next (54bc59d18178 Merge remote-tracking branch 'asoc/for-6.2' into asoc-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next
Already up to date.
Merging modules/modules-next (d6f55bb48579 module: make module_ktype structure constant)
$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next
Auto-merging arch/alpha/kernel/module.c
CONFLICT (content): Merge conflict in arch/alpha/kernel/module.c
Auto-merging arch/x86/kernel/module.c
Auto-merging include/linux/module.h
Auto-merging kernel/module/kallsyms.c
Resolved 'arch/alpha/kernel/module.c' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master d1db20d277ce] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git
$ git diff -M --stat --summary HEAD^..
arch/arc/kernel/unwind.c | 12 +-
arch/arm/kernel/module-plts.c | 9 +-
arch/arm64/kernel/module-plts.c | 13 +-
arch/ia64/kernel/module.c | 24 +--
arch/mips/kernel/vpe.c | 11 +-
arch/parisc/kernel/module.c | 51 ++----
arch/powerpc/kernel/module_32.c | 7 +-
arch/s390/kernel/module.c | 26 +--
arch/x86/kernel/callthunks.c | 4 +-
arch/x86/kernel/module.c | 4 +-
include/linux/module.h | 91 +++++++---
kernel/module/internal.h | 40 ++---
kernel/module/kallsyms.c | 58 +++---
kernel/module/kdb.c | 17 +-
kernel/module/main.c | 380 ++++++++++++++++++++--------------------
kernel/module/procfs.c | 16 +-
kernel/module/strict_rwx.c | 99 ++---------
kernel/module/tree_lookup.c | 39 ++---
kernel/params.c | 2 +-
19 files changed, 429 insertions(+), 474 deletions(-)
Merging input/next (d5f7638eb5fe Input: matrix_keypad - replace header inclusions by forward declarations)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next
Auto-merging arch/arm/mach-pxa/spitz.c
Merge made by the 'ort' strategy.
.../bindings/input/google,cros-ec-keyb.yaml | 2 +-
arch/arm/mach-pxa/spitz.c | 1 +
drivers/input/keyboard/gpio_keys.c | 3 +
drivers/input/misc/Kconfig | 11 ++
drivers/input/misc/Makefile | 1 +
drivers/input/misc/hp_sdc_rtc.c | 2 +-
drivers/input/misc/nxp-bbnsm-pwrkey.c | 193 +++++++++++++++++++++
include/linux/input/matrix_keypad.h | 5 +-
8 files changed, 214 insertions(+), 4 deletions(-)
create mode 100644 drivers/input/misc/nxp-bbnsm-pwrkey.c
Merging block/for-next (e19493205f53 Merge branch 'io_uring-6.3' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next
Auto-merging block/bio.c
Auto-merging block/blk-core.c
Auto-merging block/genhd.c
Auto-merging include/linux/blkdev.h
Auto-merging io_uring/io_uring.c
Merge made by the 'ort' strategy.
block/bio.c | 1 +
block/blk-core.c | 10 ++++++--
block/blk-zoned.c | 10 --------
block/blk.h | 2 +-
block/genhd.c | 37 ++++++++++++++++++++-------
block/ioctl.c | 13 +++++-----
block/sed-opal.c | 2 ++
drivers/block/loop.c | 8 +++---
drivers/block/ublk_drv.c | 3 ---
include/linux/blk-mq.h | 4 +--
include/linux/blkdev.h | 7 +----
include/linux/io_uring_types.h | 2 +-
include/uapi/linux/sed-opal.h | 1 +
io_uring/io_uring.c | 30 +++++++++++-----------
io_uring/kbuf.c | 2 +-
io_uring/net.c | 2 +-
io_uring/poll.c | 14 ++++++++--
io_uring/poll.h | 1 +
io_uring/rsrc.c | 58 ++++++++++++++++++++++++++++++++----------
io_uring/slist.h | 22 ----------------
io_uring/tctx.c | 2 +-
kernel/trace/blktrace.c | 6 +----
22 files changed, 132 insertions(+), 105 deletions(-)
Merging device-mapper/for-next (d695e44157c8 dm: remove unnecessary (void*) conversion in event_callback())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next
Already up to date.
Merging libata/for-next (8844f0aa8dc4 ata: pata_parport: Fix ida_alloc return value error check)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next
Already up to date.
Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver)
$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next
Already up to date.
Merging mmc/next (571f235163ac mmc: meson-gx: Use devm_platform_get_and_ioremap_resource())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next
Already up to date.
Merging mfd/for-mfd-next (59c54c599746 dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332)
$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next
Already up to date.
Merging backlight/for-backlight-next (ad614f81d2e8 backlight: ktz8866: Convert to i2c's .probe_new())
$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next
Already up to date.
Merging battery/for-next (13af134bdc6a dt-bindings: power: supply: Revise Richtek RT9467 compatible name)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-class-power | 3 ++-
.../supply/{richtek,rt9467-charger.yaml => richtek,rt9467.yaml} | 6 +++---
drivers/power/supply/power_supply_core.c | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
rename Documentation/devicetree/bindings/power/supply/{richtek,rt9467-charger.yaml => richtek,rt9467.yaml} (92%)
Merging regulator/for-next (c361e8d45e52 Merge remote-tracking branch 'regulator/for-6.2' into regulator-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next
Already up to date.
Merging security/next (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next
Already up to date.
Merging apparmor/apparmor-next (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test)
$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next
Auto-merging security/apparmor/domain.c
Auto-merging security/apparmor/file.c
Merge made by the 'ort' strategy.
security/apparmor/domain.c | 2 +-
security/apparmor/file.c | 2 +-
security/apparmor/include/task.h | 2 +-
security/apparmor/policy.c | 7 ++-----
security/apparmor/policy_unpack_test.c | 13 ++++++-------
security/apparmor/secid.c | 3 +--
security/apparmor/task.c | 5 +----
7 files changed, 13 insertions(+), 21 deletions(-)
Merging integrity/next-integrity (4958db3245fa ima: Introduce MMAP_CHECK_REQPROT hook)
$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity
Already up to date.
Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next
Already up to date.
Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest)
$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next
Already up to date.
Merging selinux/next (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next
Already up to date.
Merging smack/next (c0e48d3f7722 smackfs: Added check catlen)
$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next
Auto-merging security/smack/smack_lsm.c
Merge made by the 'ort' strategy.
security/smack/smack_lsm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging tomoyo/master (5fc44ba8be52 workqueue: Emit runtime message when flush_scheduled_work() is called)
$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master
Auto-merging include/linux/workqueue.h
Auto-merging kernel/workqueue.c
Merge made by the 'ort' strategy.
include/linux/workqueue.h | 2 ++
kernel/workqueue.c | 2 ++
2 files changed, 4 insertions(+)
Merging tpmdd/next (c6fbed5a393c tpm/eventlog: Don't abort tpm_read_log on faulty ACPI address)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next
Merge made by the 'ort' strategy.
drivers/char/tpm/eventlog/acpi.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Merging watchdog/master (4443f6ce0d12 watchdog: at91rm9200: Only warn once about problems in .remove())
$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master
Auto-merging drivers/watchdog/Kconfig
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-class-watchdog | 13 +++
.../devicetree/bindings/timer/qcom,msm-timer.txt | 47 --------
.../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 +++++++++
.../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 37 ++++++-
.../devicetree/bindings/watchdog/gpio-wdt.yaml | 55 ++++++++++
.../bindings/watchdog/mediatek,mt7621-wdt.yaml | 7 ++
.../bindings/watchdog/mediatek,mtk-wdt.yaml | 6 +
.../devicetree/bindings/watchdog/meson-wdt.txt | 21 ----
.../devicetree/bindings/watchdog/qcom-wdt.yaml | 96 ++++++++++++++--
.../devicetree/bindings/watchdog/renesas,wdt.yaml | 2 +-
.../devicetree/bindings/watchdog/watchdog.yaml | 7 +-
drivers/watchdog/Kconfig | 4 +-
drivers/watchdog/apple_wdt.c | 18 +--
drivers/watchdog/armada_37xx_wdt.c | 15 +--
drivers/watchdog/aspeed_wdt.c | 1 +
drivers/watchdog/at91rm9200_wdt.c | 2 +-
drivers/watchdog/at91sam9_wdt.c | 7 +-
drivers/watchdog/bcm7038_wdt.c | 15 +--
drivers/watchdog/cadence_wdt.c | 17 +--
drivers/watchdog/da9062_wdt.c | 15 ++-
drivers/watchdog/da9063_wdt.c | 15 ++-
drivers/watchdog/davinci_wdt.c | 18 +--
drivers/watchdog/dw_wdt.c | 1 +
drivers/watchdog/iTCO_wdt.c | 4 +-
drivers/watchdog/imgpdc_wdt.c | 31 +-----
drivers/watchdog/imx2_wdt.c | 55 +++++++++-
drivers/watchdog/imx7ulp_wdt.c | 15 +--
drivers/watchdog/lpc18xx_wdt.c | 30 +----
drivers/watchdog/meson_gxbb_wdt.c | 16 +--
drivers/watchdog/mt7621_wdt.c | 122 ++++++++++++++-------
drivers/watchdog/mtk_wdt.c | 7 ++
drivers/watchdog/of_xilinx_wdt.c | 16 +--
drivers/watchdog/pcwd_usb.c | 6 +-
drivers/watchdog/pic32-dmt.c | 15 +--
drivers/watchdog/pic32-wdt.c | 17 +--
drivers/watchdog/pnx4008_wdt.c | 15 +--
drivers/watchdog/qcom-wdt.c | 16 +--
drivers/watchdog/realtek_otto_wdt.c | 17 +--
drivers/watchdog/rtd119x_wdt.c | 16 +--
drivers/watchdog/rzg2l_wdt.c | 45 +++++++-
drivers/watchdog/rzn1_wdt.c | 18 +--
drivers/watchdog/sbsa_gwdt.c | 1 +
drivers/watchdog/visconti_wdt.c | 17 +--
drivers/watchdog/watchdog_dev.c | 23 +++-
drivers/watchdog/wdat_wdt.c | 6 +-
drivers/watchdog/ziirave_wdt.c | 5 +-
46 files changed, 527 insertions(+), 455 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/timer/qcom,msm-timer.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml
create mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml
delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt
Merging iommu/next (bedd29d793da Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next
Already up to date.
Merging audit/next (6c6cd913accd audit: update the mailing list in MAINTAINERS)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next
Already up to date.
Merging devicetree/for-next (1ba7dfb905b3 dt-bindings: regulator: Add mps,mpq7932 power-management IC)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next
Already up to date.
Merging dt-krzk/for-next (825475539974 Merge branch 'next/qcom-pinctrl' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next
Merge made by the 'ort' strategy.
Merging mailbox/mailbox-for-next (6ccbe33a3952 dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000)
$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next
Already up to date.
Merging spi/for-next (4822fc06d054 Merge remote-tracking branch 'spi/for-6.2' into spi-linus)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next
Already up to date.
Merging tip/master (7fa08de735e4 Merge branch into tip/master: 'irq/urgent')
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master
Auto-merging kernel/irq/irqdomain.c
Auto-merging kernel/irq/msi.c
Auto-merging tools/objtool/check.c
Merge made by the 'ort' strategy.
arch/x86/entry/entry_64.S | 9 +-
arch/x86/include/asm/nospec-branch.h | 2 +-
arch/x86/include/asm/orc_types.h | 4 +-
arch/x86/include/asm/unwind_hints.h | 10 +-
arch/x86/kernel/unwind_orc.c | 5 +-
drivers/pci/msi/api.c | 4 +-
include/linux/objtool.h | 11 +-
kernel/irq/ipi.c | 8 +-
kernel/irq/irqdesc.c | 4 +-
kernel/irq/irqdomain.c | 3 +-
kernel/irq/msi.c | 9 +-
tools/arch/x86/include/asm/orc_types.h | 4 +-
tools/include/linux/objtool.h | 11 +-
tools/objtool/.gitignore | 1 +
tools/objtool/Build | 2 -
tools/objtool/Documentation/objtool.txt | 8 +
tools/objtool/Makefile | 66 ++++--
tools/objtool/arch/powerpc/decode.c | 22 +-
tools/objtool/arch/x86/decode.c | 107 +++++----
tools/objtool/builtin-check.c | 2 +-
tools/objtool/check.c | 375 ++++++++++++++++++++------------
tools/objtool/elf.c | 42 ++--
tools/objtool/include/objtool/arch.h | 6 +-
tools/objtool/include/objtool/builtin.h | 2 -
tools/objtool/include/objtool/cfi.h | 1 +
tools/objtool/include/objtool/check.h | 61 +++---
tools/objtool/include/objtool/elf.h | 9 +-
tools/objtool/include/objtool/objtool.h | 1 -
tools/objtool/include/objtool/special.h | 2 +-
tools/objtool/objtool.c | 1 -
tools/objtool/orc_dump.c | 4 +-
tools/objtool/orc_gen.c | 1 +
tools/objtool/special.c | 6 +-
33 files changed, 473 insertions(+), 330 deletions(-)
Merging clockevents/timers/drivers/next (ab407a1919d2 Merge tag 'clocksource.2023.02.06b' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into timers/core)
$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next
Already up to date.
Merging edac/edac-for-next (feac08675023 Merge ras/edac-drivers into for-next)
$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next
Merge made by the 'ort' strategy.
Merging irqchip/irq/irqchip-next (a83bf176fed4 Merge branch irq/bcm-l2-fixes into irq/irqchip-next)
$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next
Already up to date.
Merging ftrace/for-next (ca6cbe8c481a Merge tools/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next
Auto-merging Documentation/trace/kprobetrace.rst
CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst
Auto-merging init/Kconfig
Auto-merging init/main.c
Auto-merging kernel/trace/trace.c
Auto-merging kernel/trace/trace_probe.c
Auto-merging kernel/trace/trace_probe.h
Resolved 'Documentation/trace/kprobetrace.rst' using previous resolution.
Automatic merge failed; fix conflicts and then commit the result.
$ git commit --no-edit -v -a
[master 5a3cbd7bd766] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git
$ git diff -M --stat --summary HEAD^..
Merging rcu/rcu/next (690ae0037d5b Merge branch 'kcsan.2023.02.22a' into HEAD)
$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next
Auto-merging arch/arm64/kvm/Kconfig
Auto-merging arch/mips/kvm/Kconfig
Auto-merging arch/riscv/kvm/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging arch/x86/kvm/Kconfig
Auto-merging mm/Kconfig
Merge made by the 'ort' strategy.
arch/arm64/kvm/Kconfig | 1 -
arch/mips/kvm/Kconfig | 1 -
arch/powerpc/kvm/Kconfig | 1 -
arch/riscv/kvm/Kconfig | 1 -
arch/s390/kvm/Kconfig | 1 -
arch/x86/Kconfig | 2 --
arch/x86/kvm/Kconfig | 1 -
kernel/rcu/Kconfig | 3 ---
mm/Kconfig | 1 -
tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 ----
10 files changed, 16 deletions(-)
Merging kvm/next (45dd9bc75d9a KVM: SVM: hyper-v: placate modpost section mismatch error)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next
Already up to date.
Merging kvm-arm/next (96a4627dbbd4 Merge tag ' https://github.com/oupton/linux tags/kvmarm-6.3' from into kvmarm-master/next)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next
Already up to date.
Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next
Already up to date.
Merging kvm-x86/next (62ef199250cd Merge branches 'apic', 'generic', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next)
$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next
Merge made by the 'ort' strategy.
Merging xen-tip/linux-next (99a7bcafbd0d x86/xen/time: cleanup xen_tsc_safe_clocksource)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next
Auto-merging arch/x86/xen/time.c
Merge made by the 'ort' strategy.
arch/x86/include/asm/xen/cpuid.h | 22 ++++++++++++++++++----
arch/x86/xen/time.c | 7 ++-----
2 files changed, 20 insertions(+), 9 deletions(-)
Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next
Merge made by the 'ort' strategy.
Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next
Already up to date.
Merging drivers-x86/for-next (0d9bdd8a5501 platform/x86: nvidia-wmi-ec-backlight: Add force module parameter)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next
Already up to date.
Merging chrome-platform/for-next (b0d8a67715da platform/chrome: cros_ec_typec: Fix spelling mistake)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next
Already up to date.
Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next
Already up to date.
Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next
Already up to date.
Merging leds-lj/for-leds-next (056f65c3938b leds: Remove ide-disk trigger)
$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next
Already up to date.
Merging ipmi/for-next (982818426a0f Merge tag 'arm-fixes-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc)
$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next
Already up to date.
Merging driver-core/driver-core-next (f3a2439f20d9 Merge tag 'rproc-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux)
$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next
Already up to date.
Merging usb/usb-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next
Already up to date.
Merging thunderbolt/next (06cbcbfaa651 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth())
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next
Already up to date.
Merging usb-serial/usb-next (617c331d9107 USB: serial: option: add support for VW/Skoda "Carstick LTE")
$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next
Already up to date.
Merging tty/tty-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next
Already up to date.
Merging char-misc/char-misc-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next
Already up to date.
Merging accel/habanalabs-next (a48bba98380c msm/fbdev: fix unused variable warning with clang.)
$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next
Already up to date.
Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next
Already up to date.
Merging fpga/for-next (ffa562d00072 fpga: bridge: return errors in the show() method of the "state" attribute)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next
Auto-merging drivers/fpga/dfl.c
Auto-merging drivers/tty/serial/8250/Kconfig
Auto-merging drivers/tty/serial/8250/Makefile
Merge made by the 'ort' strategy.
Merging icc/icc-next (7bf0008a5293 Merge branch 'icc-dt' into icc-next)
$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next
Already up to date.
Merging iio/togreg (91ba2700aa75 staging: iio: meter: Drop ade7854 driver)
$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg
Auto-merging drivers/iio/accel/kionix-kx022a.c
Merge made by the 'ort' strategy.
.../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 ++-
drivers/iio/accel/kionix-kx022a.c | 1 -
drivers/iio/chemical/sps30_i2c.c | 6 +-
drivers/iio/dac/ad5592r-base.c | 5 +
drivers/iio/proximity/sx_common.h | 1 -
drivers/staging/iio/Kconfig | 1 -
drivers/staging/iio/Makefile | 1 -
drivers/staging/iio/meter/Kconfig | 37 --
drivers/staging/iio/meter/Makefile | 8 -
drivers/staging/iio/meter/ade7854-i2c.c | 153 ------
drivers/staging/iio/meter/ade7854-spi.c | 160 ------
drivers/staging/iio/meter/ade7854.c | 556 ---------------------
drivers/staging/iio/meter/ade7854.h | 173 -------
drivers/staging/iio/meter/meter.h | 398 ---------------
14 files changed, 37 insertions(+), 1523 deletions(-)
delete mode 100644 drivers/staging/iio/meter/Kconfig
delete mode 100644 drivers/staging/iio/meter/Makefile
delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c
delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c
delete mode 100644 drivers/staging/iio/meter/ade7854.c
delete mode 100644 drivers/staging/iio/meter/ade7854.h
delete mode 100644 drivers/staging/iio/meter/meter.h
Merging phy-next/next (3584f6392f09 phy: qcom: phy-qcom-snps-eusb2: Add support for eUSB2 repeater)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next
Already up to date.
Merging soundwire/next (66f95de7c13b soundwire: cadence: further simplify low-level xfer_msg_defer() callback)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next
Already up to date.
Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional)
$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next
Merge made by the 'ort' strategy.
.../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 14 +++++++++-----
drivers/extcon/extcon-axp288.c | 2 +-
drivers/extcon/extcon-qcom-spmi-misc.c | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next
Already up to date.
Merging vfio/next (d649c34cb916 vfio: Fix NULL pointer dereference caused by uninitialized group->iommufd)
$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next
Already up to date.
Merging staging/staging-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next
Already up to date.
Merging counter-next/counter-next (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE)
$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next
Already up to date.
Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST)
$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next
Merge made by the 'ort' strategy.
drivers/mux/Kconfig | 2 +-
drivers/mux/mmio.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging dmaengine/next (e922bbf37564 dmaengine: idma64: Update bytes_transferred field)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next
Already up to date.
Merging cgroup/for-next (14fffd51f902 Merge branch 'for-6.2-fixes' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next
Merge made by the 'ort' strategy.
Merging scsi/for-next (81dab59be6ee Merge branch 'misc' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next
Auto-merging drivers/scsi/ipr.c
Auto-merging drivers/scsi/lpfc/lpfc_init.c
Auto-merging drivers/scsi/sd.c
Merge made by the 'ort' strategy.
drivers/s390/scsi/zfcp_dbf.c | 46 ++++++++++++++++-
drivers/s390/scsi/zfcp_def.h | 6 +--
drivers/s390/scsi/zfcp_ext.h | 5 +-
drivers/s390/scsi/zfcp_fsf.c | 22 ++++----
drivers/s390/scsi/zfcp_qdio.h | 2 +-
drivers/s390/scsi/zfcp_reqlist.h | 26 +++++-----
drivers/s390/scsi/zfcp_scsi.c | 2 +-
drivers/scsi/cxgbi/libcxgbi.h | 1 -
drivers/scsi/hosts.c | 4 +-
drivers/scsi/ipr.c | 54 +++++++++-----------
drivers/scsi/lpfc/lpfc_attr.c | 10 ++--
drivers/scsi/lpfc/lpfc_els.c | 4 +-
drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
drivers/scsi/lpfc/lpfc_init.c | 4 +-
drivers/scsi/lpfc/lpfc_mbox.c | 4 +-
drivers/scsi/lpfc/lpfc_nvmet.c | 2 +-
drivers/scsi/lpfc/lpfc_sli.c | 2 +-
drivers/scsi/mpi3mr/mpi3mr.h | 11 +---
drivers/scsi/mpi3mr/mpi3mr_app.c | 28 ++++-------
drivers/scsi/mpi3mr/mpi3mr_fw.c | 75 ++++++++++++---------------
drivers/scsi/mpi3mr/mpi3mr_os.c | 4 ++
drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +-
drivers/scsi/qedi/qedi_dbg.h | 1 -
drivers/scsi/qla2xxx/qla_isr.c | 2 +-
drivers/scsi/scsi_lib.c | 1 +
drivers/scsi/scsi_transport_fc.c | 10 ++--
drivers/scsi/sd.c | 29 +++--------
drivers/scsi/sd_dif.c | 10 ++--
drivers/scsi/ses.c | 64 ++++++++++++++++-------
drivers/ufs/core/ufshcd.c | 92 +++++++++++++++++-----------------
drivers/ufs/host/Kconfig | 2 +-
drivers/ufs/host/ufs-mediatek.c | 2 +
include/scsi/scsi_device.h | 1 +
include/scsi/scsi_transport_fc.h | 4 +-
include/uapi/scsi/scsi_bsg_mpi3mr.h | 8 +--
include/ufs/ufshcd.h | 1 +
36 files changed, 291 insertions(+), 252 deletions(-)
Merging scsi-mkp/for-next (901b894af5b9 scsi: zfcp: Trace when request remove fails after qdio send fails)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next
Already up to date.
Merging vhost/linux-next (0d0a7dda9cdf vp_vdpa: fix the crash in hot unplug with vp_vdpa)
$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next
Merge made by the 'ort' strategy.
drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging rpmsg/for-next (c7d00a6f6e4c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next
Merge made by the 'ort' strategy.
Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next
Already up to date.
Merging gpio-brgl/gpio/for-next (4827aae06133 gpio: sim: Use %pfwP specifier instead of calling fwnode API directly)
$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next
Already up to date.
Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next
Already up to date.
Merging pinctrl/for-next (099f37a539e6 pinctrl: qcom: Add support for i2c specific pull feature)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next
Already up to date.
Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2))
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next
Already up to date.
Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions)
$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl
Already up to date.
Merging pinctrl-samsung/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next
Already up to date.
Merging pwm/for-next (cf70d01a62c7 pwm: dwc: Use devm_pwmchip_add())
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next
Merge made by the 'ort' strategy.
.../bindings/pwm/mediatek,mt2712-pwm.yaml | 93 +++++++++++++++++
.../devicetree/bindings/pwm/pwm-mediatek.txt | 52 ----------
.../bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 68 +++++++++++++
drivers/pwm/pwm-ab8500.c | 112 +++++++++++++++++++--
drivers/pwm/pwm-dwc.c | 38 +++----
drivers/pwm/pwm-iqs620a.c | 4 +-
drivers/pwm/pwm-lp3943.c | 1 -
drivers/pwm/pwm-sifive.c | 8 +-
drivers/pwm/pwm-stm32-lp.c | 2 +-
include/linux/pwm.h | 14 +--
10 files changed, 302 insertions(+), 90 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml
delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mediatek.txt
create mode 100644 Documentation/devicetree/bindings/pwm/snps,dw-apb-timers-pwm2.yaml
Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next
Auto-merging Documentation/admin-guide/sysctl/kernel.rst
Merge made by the 'ort' strategy.
Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++---
ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++--
ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++
kernel/ucount.c | 16 ++++++-------
4 files changed, 89 insertions(+), 14 deletions(-)
Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next
Already up to date.
Merging kselftest/next (0eb15a47bf43 selftests/user_events: add a note about user_events.h dependency)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next
Already up to date.
Merging kunit/test (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test
Already up to date.
Merging kunit-next/kunit (82649c7c0da4 kunit: Add printf attribute to fail_current_test_impl)
$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit
Already up to date.
Merging livepatching/for-next (b2e118419db3 Merge branch 'for-6.3/cleanup-relocations' into for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next
Merge made by the 'ort' strategy.
Merging rtc/rtc-next (3ca04951b004 rtc: pm8xxx: add support for nvmem offset)
$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next
Auto-merging drivers/rtc/Kconfig
Auto-merging drivers/rtc/Makefile
Merge made by the 'ort' strategy.
.../bindings/rtc/amlogic,meson-vrtc.yaml | 44 ++
.../bindings/rtc/brcm,brcmstb-waketimer.yaml | 21 +-
.../devicetree/bindings/rtc/ingenic,rtc.yaml | 29 ++
.../bindings/rtc/microcrystal,rv3028.yaml | 54 +++
.../devicetree/bindings/rtc/moxa,moxart-rtc.txt | 12 +-
.../devicetree/bindings/rtc/nxp,pcf2127.yaml | 5 +-
.../devicetree/bindings/rtc/nxp,pcf85363.yaml | 60 +++
.../devicetree/bindings/rtc/nxp,pcf8563.yaml | 2 -
.../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 12 +
.../devicetree/bindings/rtc/rtc-meson-vrtc.txt | 22 -
.../devicetree/bindings/rtc/trivial-rtc.yaml | 6 +-
drivers/rtc/Kconfig | 14 +-
drivers/rtc/Makefile | 1 +
drivers/rtc/interface.c | 2 +-
drivers/rtc/rtc-ab-eoz9.c | 7 +-
drivers/rtc/rtc-abx80x.c | 77 +++
drivers/rtc/rtc-brcmstb-waketimer.c | 152 ++++--
drivers/rtc/rtc-ds1307.c | 6 +-
drivers/rtc/rtc-efi.c | 2 +-
drivers/rtc/rtc-hym8563.c | 7 +-
drivers/rtc/rtc-isl12022.c | 93 ++--
drivers/rtc/rtc-jz4740.c | 94 +++-
drivers/rtc/rtc-m41t80.c | 7 +-
drivers/rtc/rtc-max8907.c | 1 -
drivers/rtc/rtc-moxart.c | 89 ++--
drivers/rtc/rtc-nxp-bbnsm.c | 226 +++++++++
drivers/rtc/rtc-pcf2123.c | 7 +-
drivers/rtc/rtc-pcf85063.c | 7 +-
drivers/rtc/rtc-pcf8523.c | 7 +-
drivers/rtc/rtc-pcf85363.c | 44 +-
drivers/rtc/rtc-pcf8563.c | 7 +-
drivers/rtc/rtc-pm8xxx.c | 533 ++++++++++-----------
drivers/rtc/rtc-rv3028.c | 7 +
drivers/rtc/rtc-rv3029c2.c | 7 +-
drivers/rtc/rtc-rv3032.c | 14 +-
drivers/rtc/rtc-rv8803.c | 52 +-
drivers/rtc/rtc-rx6110.c | 1 -
drivers/rtc/rtc-rx8010.c | 8 +-
drivers/rtc/rtc-sun6i.c | 16 +-
include/linux/bcd.h | 4 +
40 files changed, 1228 insertions(+), 531 deletions(-)
create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml
create mode 100644 Documentation/devicetree/bindings/rtc/microcrystal,rv3028.yaml
create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85363.yaml
delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt
create mode 100644 drivers/rtc/rtc-nxp-bbnsm.c
Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next)
$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next
Already up to date.
Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next
Already up to date.
Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails)
$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next
Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c
Merge made by the 'ort' strategy.
drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++-
drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++-
drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++-
drivers/ntb/ntb_transport.c | 2 +-
drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 +
5 files changed, 20 insertions(+), 4 deletions(-)
Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning)
$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp
Already up to date.
Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next
Already up to date.
Merging slimbus/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next
Already up to date.
Merging nvmem/for-next (fa7876365ad2 nvmem: stm32: fix OPTEE dependency)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next
Auto-merging drivers/of/property.c
Auto-merging include/linux/of.h
Merge made by the 'ort' strategy.
Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated)
$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main
Merge made by the 'ort' strategy.
lib/idr.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
Merging hyperv/hyperv-next (b14033a3e6ba x86/hyperv: Fix hv_get/set_register for nested bringup)
$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next
Already up to date.
Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove())
$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay
Merge made by the 'ort' strategy.
drivers/auxdisplay/hd44780.c | 2 ++
1 file changed, 2 insertions(+)
Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function)
$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next
Already up to date.
Merging hmm/hmm (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm
Already up to date.
Merging cfi/cfi/next (312310928417 Linux 5.18-rc1)
$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next
Already up to date.
Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next
Already up to date.
Merging mhi/mhi-next (3c54a3ff0a2c bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring())
$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next
Already up to date.
Merging memblock/for-next (2fe03412e2e1 memblock: Avoid useless checks in memblock_merge_regions().)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next
Already up to date.
Merging cxl/next (e686c32590f4 dax/kmem: Fix leak of memory-hotplug resources)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next
Already up to date.
Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2)
$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next
Already up to date.
Merging efi/next (e1d447157f23 firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next
Already up to date.
Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next
Merge made by the 'ort' strategy.
fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++--------------
1 file changed, 24 insertions(+), 14 deletions(-)
Merging slab/for-next (603c592a005a Merge branch 'slab/for-6.3/fixes' into slab/for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next
Merge made by the 'ort' strategy.
Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master
Already up to date.
Merging landlock/next (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right)
$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next
Merge made by the 'ort' strategy.
include/uapi/linux/landlock.h | 46 +++++++++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 15 deletions(-)
Merging rust/rust-next (7ea01d3169a2 rust: delete rust-project.json when running make clean)
$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next
Already up to date.
Merging sysctl/sysctl-next (f1aa2eb5ea05 sysctl: fix proc_dobool() usability)
$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next
Already up to date.
Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2)
$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve
Already up to date.
Merging bitmap/bitmap-for-next (18e93f4dc099 bitmap: switch from inline to __always_inline)
$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next
Auto-merging include/linux/cpumask.h
Auto-merging include/linux/find.h
Auto-merging include/linux/nodemask.h
Merge made by the 'ort' strategy.
include/linux/bitmap.h | 46 +++++++--------
include/linux/cpumask.h | 142 +++++++++++++++++++++++------------------------
include/linux/find.h | 40 ++++++-------
include/linux/nodemask.h | 86 ++++++++++++++--------------
4 files changed, 157 insertions(+), 157 deletions(-)
Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next
Already up to date.
Merging kspp/for-next/kspp (78f7a3fd6dc6 randstruct: disable Clang 15 support)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp
Already up to date.
Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper)
$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp
Already up to date.
Merging iommufd/for-next (939204e4df96 Merge tag 'v6.2' into iommufd.git for-next)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next
Already up to date.
|
