-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathmerge.log
10381 lines (10381 loc) · 622 KB
/
merge.log
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
$ date -R
Wed, 13 Dec 2023 08:26:08 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
Updating files: 69% (4626/6609)Updating files: 70% (4627/6609)Updating files: 71% (4693/6609)Updating files: 72% (4759/6609)Updating files: 73% (4825/6609)Updating files: 74% (4891/6609)Updating files: 75% (4957/6609)Updating files: 76% (5023/6609)Updating files: 77% (5089/6609)Updating files: 78% (5156/6609)Updating files: 79% (5222/6609)Updating files: 80% (5288/6609)Updating files: 81% (5354/6609)Updating files: 82% (5420/6609)Updating files: 83% (5486/6609)Updating files: 84% (5552/6609)Updating files: 85% (5618/6609)Updating files: 86% (5684/6609)Updating files: 87% (5750/6609)Updating files: 88% (5816/6609)Updating files: 89% (5883/6609)Updating files: 90% (5949/6609)Updating files: 91% (6015/6609)Updating files: 92% (6081/6609)Updating files: 93% (6147/6609)Updating files: 94% (6213/6609)Updating files: 95% (6279/6609)Updating files: 96% (6345/6609)Updating files: 97% (6411/6609)Updating files: 98% (6477/6609)Updating files: 99% (6543/6609)Updating files: 100% (6609/6609)Updating files: 100% (6609/6609), done.
HEAD is now at a39b6ac3781d Linux 6.7-rc5
Merging origin/master (cf52eed70e55 Merge tag 'ext4_for_linus-6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master
Updating a39b6ac3781d..cf52eed70e55
Fast-forward (no commit created; -m option ignored)
Documentation/filesystems/fuse-io.rst | 3 +-
fs/afs/rxrpc.c | 2 +-
fs/bcachefs/btree_cache.c | 8 +--
fs/bcachefs/btree_io.c | 4 +-
fs/bcachefs/btree_io.h | 3 -
fs/bcachefs/btree_key_cache.c | 2 -
fs/bcachefs/btree_update.c | 16 +++++
fs/bcachefs/btree_update_interior.c | 11 ++++
fs/bcachefs/data_update.c | 4 +-
fs/bcachefs/dirent.c | 19 +++---
fs/bcachefs/dirent.h | 1 +
fs/bcachefs/extents.c | 3 +-
fs/bcachefs/fs-ioctl.c | 2 +-
fs/bcachefs/fs.c | 3 +
fs/bcachefs/inode.c | 15 +++--
fs/bcachefs/journal.c | 8 +--
fs/bcachefs/journal.h | 1 +
fs/bcachefs/journal_io.c | 1 +
fs/bcachefs/journal_reclaim.c | 3 +
fs/bcachefs/recovery.c | 2 +-
fs/bcachefs/reflink.c | 8 +++
fs/bcachefs/sysfs.c | 8 +--
fs/ext4/file.c | 14 +++--
fs/ext4/mballoc.c | 4 ++
fs/fuse/dax.c | 1 +
fs/fuse/file.c | 8 ++-
fs/fuse/fuse_i.h | 19 +++++-
fs/fuse/inode.c | 81 ++++++++++++++++++++++--
fs/jbd2/commit.c | 10 +--
fs/jbd2/journal.c | 24 ++++---
fs/smb/common/smb2pdu.h | 3 +-
fs/smb/server/oplock.c | 115 ++++++++++++++++++++++++++++++----
fs/smb/server/oplock.h | 8 ++-
fs/smb/server/smb2ops.c | 9 ++-
fs/smb/server/smb2pdu.c | 62 ++++++++++--------
fs/smb/server/vfs.c | 3 +
fs/smb/server/vfs_cache.c | 13 +++-
fs/smb/server/vfs_cache.h | 3 +
include/linux/jbd2.h | 3 +
include/uapi/linux/fuse.h | 10 +--
40 files changed, 397 insertions(+), 120 deletions(-)
Merging fixes/fixes (2dde18cd1d8f Linux 6.5)
$ 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 (1b0d766020dc mm/mglru: reclaim offlined memcgs harder)
$ 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.
arch/loongarch/kernel/Makefile | 2 +-
arch/m68k/include/asm/kexec.h | 4 +-
arch/m68k/kernel/Makefile | 2 +-
arch/mips/cavium-octeon/smp.c | 4 +-
arch/mips/include/asm/kexec.h | 2 +-
arch/mips/include/asm/smp-ops.h | 2 +-
arch/mips/include/asm/smp.h | 2 +-
arch/mips/kernel/Makefile | 2 +-
arch/mips/kernel/smp-bmips.c | 4 +-
arch/mips/kernel/smp-cps.c | 10 ++---
arch/mips/loongson64/reset.c | 4 +-
arch/mips/loongson64/smp.c | 2 +-
arch/powerpc/Kconfig | 4 +-
arch/riscv/Kconfig | 8 ++--
arch/riscv/include/asm/pgtable.h | 2 +-
arch/riscv/kernel/crash_core.c | 4 +-
arch/s390/Kconfig | 4 +-
arch/sh/include/asm/kexec.h | 4 +-
arch/sh/kernel/Makefile | 2 +-
arch/sh/kernel/reboot.c | 4 +-
arch/sh/kernel/setup.c | 2 +-
arch/x86/Kconfig | 4 +-
arch/x86/boot/compressed/acpi.c | 2 +-
include/linux/damon.h | 2 +
include/linux/mm.h | 8 ++--
include/linux/mm_inline.h | 23 ++++++----
include/linux/mmzone.h | 48 +++++++++++++--------
kernel/Kconfig.kexec | 3 +-
kernel/crash_core.c | 10 ++---
mm/damon/core.c | 6 +++
mm/shmem.c | 19 ++++++++-
mm/sparse.c | 17 ++++----
mm/vmscan.c | 92 ++++++++++++++++++++++++++--------------
mm/workingset.c | 6 +--
tools/testing/selftests/Makefile | 21 +--------
tools/testing/selftests/lib.mk | 40 ++---------------
tools/testing/selftests/mm/cow.c | 3 +-
37 files changed, 200 insertions(+), 178 deletions(-)
Merging kbuild-current/fixes (98b1cc82c4af Linux 6.7-rc2)
$ 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 (0bb80ecc33a8 Linux 6.6-rc1)
$ 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 (f54e8634d136 ARM: 9330/1: davinci: also select PINCTRL)
$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes
Merge made by the 'ort' strategy.
arch/arm/mach-davinci/Kconfig | 1 +
arch/arm/vfp/vfpmodule.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
Merging arm64-fixes/for-next/fixes (3c0696076aad arm64: mm: Always make sw-dirty PTEs hw-dirty in pte_modify)
$ 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
Merge made by the 'ort' strategy.
arch/arm64/include/asm/pgtable.h | 6 ++++++
drivers/perf/arm-cmn.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
Merging arm-soc-fixes/arm/fixes (fd1e5745f87a Merge tag 'v6.7-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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 (06c2afb862f9 Linux 6.5-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 (b85ea95d0864 Linux 6.7-rc1)
$ 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 (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3())
$ 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 (4b3338aaa74d powerpc/ftrace: Fix stack teardown in ftrace_no_trace)
$ 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 (b1a6a1a77f06 s390/scm: fix virtual vs physical address confusion)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes
Merge made by the 'ort' strategy.
drivers/s390/block/scm_blk.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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 (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref())
$ 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 (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY)
$ 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 (810c38a369a0 net/rose: Fix Use-After-Free in rose_ioctl)
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main
Auto-merging MAINTAINERS
Merge made by the 'ort' strategy.
MAINTAINERS | 1 -
drivers/atm/solos-pci.c | 8 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 38 +-
drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 11 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 19 +-
drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 5 +-
drivers/net/ethernet/freescale/fec_main.c | 27 +-
.../net/ethernet/marvell/octeon_ep/octep_main.c | 25 +-
drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 11 +-
.../ethernet/marvell/octeontx2/af/rvu_devlink.c | 5 +-
.../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 55 ++-
.../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 25 +-
drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 +
.../ethernet/mellanox/mlx5/core/en/tc/post_act.c | 6 +
.../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 56 ++-
.../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 22 +-
.../mellanox/mlx5/core/en_accel/ipsec_fs.c | 447 ++++++++++++++++++---
.../mellanox/mlx5/core/en_accel/ipsec_offload.c | 10 +-
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 27 +-
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +-
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 25 +-
.../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.c | 162 +-------
.../net/ethernet/mellanox/mlx5/core/esw/ipsec_fs.h | 15 -
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 35 +-
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 56 +--
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 29 ++
drivers/net/ethernet/qualcomm/qca_debug.c | 17 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 20 +-
drivers/net/team/team.c | 4 +-
include/linux/mlx5/mlx5_ifc.h | 9 +-
include/net/addrconf.h | 12 +-
include/net/if_inet6.h | 4 -
include/net/netfilter/nf_flow_table.h | 10 +
net/atm/ioctl.c | 7 +-
net/core/neighbour.c | 9 +-
net/ipv4/tcp_input.c | 22 +-
net/ipv6/addrconf.c | 6 +-
net/rose/af_rose.c | 4 +-
net/sched/act_ct.c | 34 +-
41 files changed, 854 insertions(+), 439 deletions(-)
Merging bpf/master (e307b5a845c5 octeontx2-af: Fix pause frame configuration)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master
Already up to date.
Merging ipsec/master (76df934c6d5f MAINTAINERS: Add netdev subsystem profile link)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master
Already up to date.
Merging netfilter/main (1ae4cd3cbdd0 Merge branch 'bnxt_en-misc-fixes')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main
Already up to date.
Merging ipvs/main (54d4434da824 Merge branch 'hv_netvsc-fix-race-of-netvsc-vf-register-and-slave-bit')
$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main
Already up to date.
Merging wireless/for-next (cd607f2cbbbe wifi: mt76: fix crash with WED rx support enabled)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next
Merge made by the 'ort' strategy.
drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +-
drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 +-
drivers/net/wireless/mediatek/mt76/dma.c | 10 +--
include/linux/ieee80211.h | 3 +-
net/mac80211/cfg.c | 4 +-
net/mac80211/driver-ops.c | 6 +-
net/mac80211/mesh_plink.c | 16 +++--
net/mac80211/mlme.c | 4 +-
net/rfkill/rfkill-gpio.c | 8 +++
net/wireless/certs/wens.hex | 87 +++++++++++++++++++++++++
10 files changed, 125 insertions(+), 19 deletions(-)
create mode 100644 net/wireless/certs/wens.hex
Merging wpan/master (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux)
$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master
Already up to date.
Merging rdma-fixes/for-rc (a39b6ac3781d Linux 6.7-rc5)
$ 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 (33071422714a ALSA: hda/tas2781: handle missing EFI calibration data)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus
Merge made by the 'ort' strategy.
sound/pci/hda/patch_hdmi.c | 3 +++
sound/pci/hda/patch_realtek.c | 1 +
sound/pci/hda/tas2781_hda_i2c.c | 12 ++++++++----
3 files changed, 12 insertions(+), 4 deletions(-)
Merging sound-asoc-fixes/for-linus (dc96528b176f ASoC: cs42l43: Don't enable bias sense during type detect)
$ 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.
sound/soc/codecs/cs35l45-i2c.c | 2 +-
sound/soc/codecs/cs35l45-spi.c | 2 +-
sound/soc/codecs/cs35l45.c | 56 +++++++++++++++++++++--
sound/soc/codecs/cs42l43-jack.c | 21 +++++----
sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 8 ++--
sound/soc/sof/mediatek/mt8186/mt8186.c | 3 --
6 files changed, 68 insertions(+), 24 deletions(-)
Merging regmap-fixes/for-linus (fea88064445a regmap: fix bogus error on regcache_sync success)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus
Already up to date.
Merging spi-fixes/for-linus (e9b220aeacf1 spi: spi-imx: correctly configure burst length when using dma)
$ 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-atmel.c | 13 ++++---------
drivers/spi/spi-cadence.c | 1 -
drivers/spi/spi-imx.c | 15 +++++++++++----
3 files changed, 15 insertions(+), 14 deletions(-)
Merging pci-current/for-linus (7ff2b7a1821b PCI/ASPM: Add pci_disable_link_state_locked() lockdep assert)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus
Merge made by the 'ort' strategy.
drivers/pci/controller/dwc/pcie-qcom.c | 7 ++--
drivers/pci/controller/pci-loongson.c | 46 +++++++++++++++++++++---
drivers/pci/controller/vmd.c | 2 +-
drivers/pci/pcie/aspm.c | 65 ++++++++++++++++++++++++----------
include/linux/pci.h | 3 ++
5 files changed, 97 insertions(+), 26 deletions(-)
Merging driver-core.current/driver-core-linus (2cc14f52aeb7 Linux 6.7-rc3)
$ 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
Already up to date.
Merging tty.current/tty-linus (a39b6ac3781d Linux 6.7-rc5)
$ 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 (da48708e8733 Merge tag 'thunderbolt-for-v6.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt into usb-linus)
$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus
Merge made by the 'ort' strategy.
drivers/thunderbolt/debugfs.c | 2 +-
drivers/thunderbolt/usb4.c | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
Merging usb-serial-fixes/usb-linus (2cc14f52aeb7 Linux 6.7-rc3)
$ 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 (2a9c713825b3 phy: sunplus: return negative error code in sp_usb_phy_probe)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes
Merge made by the 'ort' strategy.
drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c | 2 +-
drivers/phy/sunplus/phy-sunplus-usb2.c | 2 +-
drivers/phy/ti/phy-gmii-sel.c | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
Merging staging.current/staging-linus (98b1cc82c4af Linux 6.7-rc2)
$ 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 (408d4b33c244 iio: adc: MCP3564: fix hardware identification logic)
$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg
Merge made by the 'ort' strategy.
drivers/iio/accel/kionix-kx022a.c | 37 ++++--
drivers/iio/adc/imx93_adc.c | 4 +
drivers/iio/adc/mcp3564.c | 8 +-
drivers/iio/adc/meson_saradc.c | 16 ++-
drivers/iio/adc/ti_am335x_adc.c | 4 +-
drivers/iio/buffer/industrialio-triggered-buffer.c | 10 ++
drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +-
drivers/iio/imu/adis16475.c | 133 +++++++++++++--------
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 4 +-
drivers/iio/magnetometer/tmag5273.c | 2 +-
10 files changed, 147 insertions(+), 75 deletions(-)
Merging counter-current/counter-current (a39b6ac3781d Linux 6.7-rc5)
$ 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 (76101fa0c0a9 Merge tag 'iio-fixes-for-6.7a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus)
$ 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
Merge made by the 'ort' strategy.
drivers/interconnect/core.c | 3 +++
drivers/interconnect/qcom/icc-rpm.c | 2 +-
drivers/interconnect/qcom/sm8250.c | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
Merging soundwire-fixes/fixes (393cae5f32d6 soundwire: intel_ace2x: fix AC timing setting for ACE2.x)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes
Merge made by the 'ort' strategy.
drivers/soundwire/intel_ace2x.c | 3 ++-
drivers/soundwire/stream.c | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
Merging thunderbolt-fixes/fixes (f0b94c1c5c79 thunderbolt: Fix minimum allocated USB 3.x and PCIe bandwidth)
$ 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 (59b6a747e2d3 Input: ipaq-micro-keys - add error handling for devm_kmemdup)
$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus
Merge made by the 'ort' strategy.
drivers/input/keyboard/atkbd.c | 46 +++++++++++++++++++++++++++++---
drivers/input/keyboard/ipaq-micro-keys.c | 3 +++
drivers/input/mouse/amimouse.c | 5 ++--
drivers/input/mouse/synaptics.c | 1 +
drivers/input/serio/i8042-acpipnpio.h | 8 ++++++
5 files changed, 56 insertions(+), 7 deletions(-)
Merging crypto-current/master (9aedd10fe384 crypto: ahash - Set using_shash for cloned ahash wrapper over shash)
$ 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ 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 (4ee632c82d2d dmaengine: fsl-edma: fix DMA channel leak in eDMAv4)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes
Merge made by the 'ort' strategy.
drivers/dma/fsl-edma-common.c | 1 +
drivers/dma/fsl-edma-main.c | 12 ++++++++----
drivers/dma/idxd/registers.h | 12 +++++++-----
drivers/dma/idxd/submit.c | 14 +++++++-------
drivers/dma/stm32-dma.c | 8 ++++++--
drivers/dma/ti/k3-psil-am62.c | 12 ++++++------
drivers/dma/ti/k3-psil-am62a.c | 12 ++++++------
7 files changed, 41 insertions(+), 30 deletions(-)
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 (7c1b1906229d mtd: spinand: gigadevice: Fix the get ecc status issue)
$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes
Merge made by the 'ort' strategy.
drivers/mtd/nand/spi/gigadevice.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
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 (32138be394e5 Merge tag 'media-renesas-fixes-20231113' of git://git.kernel.org/pub/scm/linux/kernel/git/pinchartl/linux.git)
$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes
Already up to date.
Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets)
$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes
Merge made by the 'ort' strategy.
drivers/reset/core.c | 8 ++++----
drivers/reset/hisilicon/hi6220_reset.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
Merging mips-fixes/mips-fixes (a39b6ac3781d Linux 6.7-rc5)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ 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 (c72b9c33ef96 ARM: OMAP2+: Fix null pointer dereference and memory leak in omap_soc_device_init)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes
Merge made by the 'ort' strategy.
arch/arm/boot/dts/ti/omap/dra7.dtsi | 2 +-
arch/arm/mach-omap2/id.c | 5 +++++
drivers/bus/ti-sysc.c | 18 ++++++++++++++----
3 files changed, 20 insertions(+), 5 deletions(-)
Merging kvm-fixes/master (4cdf351d3630 KVM: SVM: Update EFER software model on CR0 trap for SEV-ES)
$ 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 (27072b8e18a7 KVM: s390/mm: Properly reset no-dat)
$ 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 (a39b6ac3781d Linux 6.7-rc5)
$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon
Already up to date.
Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt 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 (8f61d48c83f6 tools/testing/cxl: Slow down the mock firmware transfer)
$ 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 (cdec1b57f10a Merge branch 'misc-6.7' 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.
fs/btrfs/delalloc-space.c | 2 +-
fs/btrfs/disk-io.c | 28 +++++++++++++++++++++++++++
fs/btrfs/extent-tree.c | 48 +++++++++++++++++++++++++++++++++--------------
fs/btrfs/extent_io.c | 3 ++-
fs/btrfs/file.c | 2 +-
fs/btrfs/inode.c | 16 ++++++++--------
fs/btrfs/ordered-data.c | 11 +++++++----
fs/btrfs/qgroup.c | 44 ++++++++++++++++++++++++++++---------------
fs/btrfs/qgroup.h | 7 +++----
fs/btrfs/transaction.c | 2 --
fs/btrfs/transaction.h | 3 +++
11 files changed, 116 insertions(+), 50 deletions(-)
Merging vfs-fixes/fixes (dc32464a5fe4 ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes
Already up to date.
Merging dma-mapping-fixes/for-linus (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages)
$ 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 (7bcd032370f8 platform/x86: intel_ips: fix kernel-doc formatting)
$ 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
Merge made by the 'ort' strategy.
drivers/platform/x86/intel/vbtn.c | 19 +++++++++++++++----
drivers/platform/x86/intel_ips.c | 30 +++++++++++++++++++++++-------
drivers/platform/x86/thinkpad_acpi.c | 6 +++---
3 files changed, 41 insertions(+), 14 deletions(-)
Merging samsung-krzk-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
$ 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 (b85ea95d0864 Linux 6.7-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 (136c6531ba12 dt-bindings: display: adi,adv75xx: Document #sound-dai-cells)
$ 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 (b85ea95d0864 Linux 6.7-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 (235f2b548d7f scsi: be2iscsi: Fix a memleak in beiscsi_init_wrb_handle())
$ 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 (a39b6ac3781d Linux 6.7-rc5)
$ 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 (e6861d8264cd drm/i915/edp: don't write to DP_LINK_BW_SET when using rate select)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes
Merge made by the 'ort' strategy.
.../gpu/drm/i915/display/intel_dp_link_training.c | 31 +++++++++++++++-------
drivers/gpu/drm/i915/display/intel_fb.c | 19 ++++++++++---
drivers/gpu/drm/i915/display/skl_scaler.c | 2 +-
drivers/gpu/drm/i915/gt/intel_reset.c | 2 +-
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 5 ++--
drivers/gpu/drm/i915/i915_gpu_error.h | 12 +++++++--
drivers/gpu/drm/i915/selftests/igt_live_test.c | 9 ++++---
drivers/gpu/drm/i915/selftests/igt_live_test.h | 3 ++-
8 files changed, 59 insertions(+), 24 deletions(-)
Merging mmc-fixes/fixes (1036f69e2513 mmc: core: Cancel delayed work before releasing host)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes
Merge made by the 'ort' strategy.
drivers/mmc/core/block.c | 7 ++++---
drivers/mmc/core/host.c | 1 +
drivers/mmc/host/meson-mx-sdhc-mmc.c | 26 +++++---------------------
3 files changed, 10 insertions(+), 24 deletions(-)
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 (98b1cc82c4af Linux 6.7-rc2)
$ 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 (564eac2860bd hv_utils: Allow implicit ICTIMESYNCFLAG_SYNC)
$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes
Merge made by the 'ort' strategy.
drivers/hv/hv_util.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1)
$ 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 (eb46a0076501 riscv: Check if the code to patch lies in the exit section)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes
Merge made by the 'ort' strategy.
arch/riscv/include/asm/sections.h | 1 +
arch/riscv/kernel/patch.c | 11 ++++++++++-
arch/riscv/kernel/vmlinux.lds.S | 2 ++
3 files changed, 13 insertions(+), 1 deletion(-)
Merging riscv-dt-fixes/riscv-dt-fixes (79997eda0d31 riscv: dts: microchip: move timebase-frequency to mpfs.dtsi)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ 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
Already up to date.
Merging fpga-fixes/fixes (b85ea95d0864 Linux 6.7-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 (a39b6ac3781d Linux 6.7-rc5)
$ 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 (95dd1e34ff5b gpiolib: sysfs: Fix error handling on failed export)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ 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 (b85ea95d0864 Linux 6.7-rc1)
$ 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 (62b241efff99 MAINTAINERS: erofs: add EROFS webpage)
$ 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 (1bddcf77ce66 kunit: test: Avoid cast warning when adding kfree() as an action)
$ 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 (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list)
$ 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 (bf51c52a1f3c NFSD: Fix checksum mismatches in the duplicate reply cache)
$ 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 (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance)
$ 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 (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM)
$ 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-tools (b16937474874 perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback)
$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools
Already up to date.
Merging efi-fixes/urgent (50d7cdf7a9b1 efi/x86: Avoid physical KASLR on older Dell systems)
$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent
Merge made by the 'ort' strategy.
arch/loongarch/include/asm/efi.h | 2 +-
drivers/firmware/efi/libstub/loongarch-stub.c | 4 ++--
drivers/firmware/efi/libstub/loongarch.c | 6 +++---
drivers/firmware/efi/libstub/x86-stub.c | 31 +++++++++++++++++++++------
4 files changed, 30 insertions(+), 13 deletions(-)
Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning)
$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus
Already up to date.
Merging battery-fixes/fixes (f37669119423 power: supply: cw2015: correct time_to_empty units in sysfs)
$ 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/cw2015_battery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build)
$ 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 (6f9c4d8c468c iommufd: Do not UAF during iommufd_put_object())
$ 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 (cfd96726e611 rust: docs: fix logo replacement)
$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes
Already up to date.
Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5)
$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next
Already up to date.
Merging w1-fixes/fixes (b85ea95d0864 Linux 6.7-rc1)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes
Already up to date.
Merging pmdomain-fixes/fixes (0cb19e50a911 pmdomain: arm: Avoid polling for scmi_perf_domain)
$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes
Already up to date.
Merging overlayfs-fixes/ovl-fixes (37f32f526438 ovl: fix memory leak in ovl_parse_param())
$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes
Already up to date.
Merging drm-misc-fixes/for-linux-next-fixes (759f14e20891 drm/edid: also call add modes in EDID connector update fallback)
$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes
Merge made by the 'ort' strategy.
drivers/accel/ivpu/ivpu_hw_37xx.c | 12 +++++++++---
drivers/gpu/drm/drm_auth.c | 2 +-
drivers/gpu/drm/drm_crtc.c | 8 ++++----
drivers/gpu/drm/drm_edid.c | 3 ++-
4 files changed, 16 insertions(+), 9 deletions(-)
Merging mm-stable/mm-stable (d9d9bd979cce maple_tree: change return type of mas_split_final_node as void.)
$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable
Auto-merging MAINTAINERS
Auto-merging fs/bcachefs/fs.c
Auto-merging fs/btrfs/inode.c
Auto-merging include/linux/damon.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/mmzone.h
Auto-merging mm/damon/core.c
Auto-merging mm/shmem.c
Auto-merging mm/vmscan.c
Auto-merging mm/workingset.c
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-kernel-mm-damon | 33 +-
Documentation/admin-guide/blockdev/zram.rst | 2 +-
Documentation/admin-guide/mm/damon/usage.rst | 48 +-
Documentation/admin-guide/mm/pagemap.rst | 1 +
Documentation/admin-guide/mm/zswap.rst | 10 +
Documentation/core-api/maple_tree.rst | 4 +
Documentation/filesystems/locking.rst | 4 +-
Documentation/filesystems/vfs.rst | 6 +-
Documentation/mm/arch_pgtable_helpers.rst | 2 -
Documentation/mm/damon/design.rst | 13 +
MAINTAINERS | 1 +
arch/loongarch/kernel/numa.c | 28 +-
arch/x86/mm/numa.c | 34 +-
block/fops.c | 2 +-
drivers/android/binder_alloc.c | 7 +-
drivers/block/zram/Kconfig | 15 +-
drivers/block/zram/zram_drv.c | 57 +-
drivers/block/zram/zram_drv.h | 2 +-
drivers/dax/bus.c | 3 +
drivers/dax/bus.h | 1 +
drivers/dax/cxl.c | 1 +
drivers/dax/dax-private.h | 1 +
drivers/dax/hmem/hmem.c | 1 +
drivers/dax/kmem.c | 8 +-
drivers/dax/pmem.c | 1 +
fs/Kconfig | 22 +-
fs/afs/write.c | 8 +-
fs/bcachefs/fs.c | 2 +-
fs/btrfs/inode.c | 2 +-
fs/ceph/addr.c | 4 +-
fs/dcache.c | 8 +-
fs/ext2/inode.c | 2 +-
fs/ext4/inline.c | 3 +-
fs/ext4/inode.c | 6 +-
fs/f2fs/compress.c | 2 +-
fs/f2fs/inode.c | 2 +-
fs/gfs2/aops.c | 41 +-
fs/gfs2/quota.c | 6 +-
fs/hugetlbfs/inode.c | 6 +-
fs/inode.c | 4 +-
fs/iomap/buffered-io.c | 14 +-
fs/nfs/file.c | 2 +-
fs/nfs/nfs42xattr.c | 8 +-
fs/nfsd/filecache.c | 4 +-
fs/ntfs/aops.c | 6 +-
fs/ocfs2/aops.c | 2 +-
fs/proc/task_mmu.c | 17 +-
fs/smb/client/file.c | 6 +-
fs/xfs/xfs_aops.c | 2 +-
fs/xfs/xfs_buf.c | 6 +-
fs/xfs/xfs_dquot.c | 2 +-
fs/xfs/xfs_qm.c | 2 +-
fs/zonefs/file.c | 2 +-
include/linux/damon.h | 20 +
include/linux/fs.h | 2 +-
include/linux/gfp_types.h | 5 +-
include/linux/highmem.h | 76 ++
include/linux/ksm.h | 4 +-
include/linux/list_lru.h | 92 +-
include/linux/maple_tree.h | 411 ++++----
include/linux/memblock.h | 1 +
include/linux/memcontrol.h | 15 +
include/linux/memremap.h | 12 -
include/linux/mm.h | 40 +-
include/linux/mm_types.h | 11 +-
include/linux/mmzone.h | 6 +
include/linux/page-flags.h | 9 +-
include/linux/rmap.h | 4 +-
include/linux/stackdepot.h | 59 +-
include/linux/vm_event_item.h | 4 +-
include/linux/zswap.h | 27 +-
include/uapi/linux/fs.h | 1 +
kernel/fork.c | 40 +-
lib/Kconfig | 10 +
lib/Kconfig.kasan | 23 +-
lib/maple_tree.c | 1077 +++++++++++++--------
lib/stackdepot.c | 456 ++++++---
lib/test_maple_tree.c | 341 ++++---
mm/Kconfig | 20 +
mm/cma.c | 2 +-
mm/compaction.c | 3 +
mm/damon/core-test.h | 47 +-
mm/damon/core.c | 68 +-
mm/damon/sysfs-common.h | 3 +
mm/damon/sysfs-schemes.c | 272 +++++-
mm/damon/sysfs.c | 27 +
mm/filemap.c | 4 +-
mm/folio-compat.c | 4 +-
mm/gup.c | 2 +
mm/huge_memory.c | 16 +-
mm/hugetlb_vmemmap.c | 290 ++----
mm/internal.h | 25 +-
mm/kasan/common.c | 16 +-
mm/kasan/generic.c | 66 +-
mm/kasan/kasan.h | 10 +-
mm/kasan/quarantine.c | 26 +-
mm/kasan/report.c | 12 +
mm/kasan/report_tags.c | 42 +-
mm/kasan/tags.c | 39 +-
mm/kmemleak.c | 186 ++--
mm/kmsan/core.c | 7 +-
mm/ksm.c | 43 +-
mm/list_lru.c | 48 +-
mm/memblock.c | 34 +
mm/memcontrol.c | 7 +
mm/memory-failure.c | 115 ++-
mm/memory.c | 91 +-
mm/memory_hotplug.c | 210 ++--
mm/mempool.c | 8 +-
mm/memremap.c | 14 +-
mm/mm_init.c | 3 +-
mm/mmap.c | 46 +-
mm/mmzone.c | 1 +
mm/oom_kill.c | 7 +-
mm/page-writeback.c | 54 +-
mm/page_alloc.c | 36 +-
mm/page_owner.c | 9 +-
mm/page_poison.c | 8 +-
mm/pagewalk.c | 29 +-
mm/process_vm_access.c | 15 +-
mm/readahead.c | 14 +-
mm/shmem.c | 6 +-
mm/slub.c | 41 +-
mm/swap.h | 3 +-
mm/swap_state.c | 26 +-
mm/swapfile.c | 34 +-
mm/truncate.c | 51 +-
mm/util.c | 8 +-
mm/vmscan.c | 12 +-
mm/vmstat.c | 7 +-
mm/workingset.c | 4 +-
mm/zswap.c | 474 +++++++--
samples/Kconfig | 6 +
samples/Makefile | 1 +
samples/cgroup/Makefile | 5 +
{tools => samples}/cgroup/cgroup_event_listener.c | 0
samples/cgroup/memcg_event_listener.c | 330 +++++++
tools/cgroup/Makefile | 11 -
tools/include/linux/rwsem.h | 4 +
tools/include/linux/spinlock.h | 1 +
tools/include/uapi/linux/fs.h | 1 +
tools/testing/radix-tree/linux.c | 45 +-
tools/testing/radix-tree/linux/maple_tree.h | 2 +-
tools/testing/radix-tree/maple.c | 390 +++++++-
tools/testing/selftests/cgroup/test_zswap.c | 76 +-
tools/testing/selftests/damon/sysfs.sh | 27 +
tools/testing/selftests/mm/run_vmtests.sh | 2 -
tools/testing/selftests/mm/vm_util.c | 80 +-
148 files changed, 4722 insertions(+), 2126 deletions(-)
create mode 100644 samples/cgroup/Makefile
rename {tools => samples}/cgroup/cgroup_event_listener.c (100%)
create mode 100644 samples/cgroup/memcg_event_listener.c
delete mode 100644 tools/cgroup/Makefile
Merging mm-nonmm-stable/mm-nonmm-stable (e52ec6a2db2e scripts/gdb: remove exception handling and refine print format)
$ 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
Auto-merging Makefile
Auto-merging arch/mips/include/asm/smp.h
Auto-merging arch/mips/kernel/smp.c
Auto-merging kernel/fork.c
Merge made by the 'ort' strategy.
Documentation/filesystems/squashfs.rst | 60 ++++++
Makefile | 6 +-
arch/Kconfig | 13 --
arch/alpha/lib/Makefile | 1 -
arch/alpha/mm/Makefile | 2 -
arch/hexagon/include/asm/irq.h | 3 +
arch/hexagon/kernel/process.c | 2 +
arch/hexagon/kernel/reset.c | 1 +
arch/hexagon/kernel/signal.c | 2 +-
arch/hexagon/kernel/smp.c | 4 +-
arch/hexagon/kernel/time.c | 4 +-
arch/hexagon/kernel/traps.c | 11 +-
arch/hexagon/kernel/vdso.c | 1 +
arch/hexagon/kernel/vm_events.c | 7 -
arch/hexagon/mm/init.c | 3 +-
arch/hexagon/mm/uaccess.c | 8 -
arch/hexagon/mm/vm_fault.c | 3 +-
arch/hexagon/mm/vm_tlb.c | 1 +
arch/mips/Kbuild | 6 -
arch/mips/boot/compressed/dbg.c | 2 +
arch/mips/boot/compressed/decompress.c | 16 +-
arch/mips/boot/compressed/decompress.h | 24 +++
arch/mips/boot/compressed/string.c | 1 +
arch/mips/include/asm/cache.h | 6 +
arch/mips/include/asm/jump_label.h | 3 +
arch/mips/include/asm/mach-loongson64/mmzone.h | 1 -
arch/mips/include/asm/mmzone.h | 2 +
arch/mips/include/asm/processor.h | 2 +
arch/mips/include/asm/r4kcache.h | 4 +
arch/mips/include/asm/setup.h | 1 +
arch/mips/include/asm/signal.h | 1 +
arch/mips/include/asm/smp.h | 2 +
arch/mips/include/asm/spram.h | 2 +-
arch/mips/include/asm/syscalls.h | 33 ++++
arch/mips/include/asm/tlbex.h | 1 +
arch/mips/include/asm/traps.h | 24 +++
arch/mips/include/asm/uasm.h | 2 -
arch/mips/kernel/cpu-probe.c | 1 -
arch/mips/kernel/cpu-r3k-probe.c | 1 -
arch/mips/kernel/linux32.c | 1 +
arch/mips/kernel/machine_kexec.c | 1 +
arch/mips/kernel/mips-cm.c | 2 +-
arch/mips/kernel/mips-mt-fpaff.c | 1 +
arch/mips/kernel/mips-mt.c | 1 +
arch/mips/kernel/module.c | 3 +-
arch/mips/kernel/r4k-bugs64.c | 1 +
arch/mips/kernel/signal-common.h | 3 +
arch/mips/kernel/signal.c | 1 +
arch/mips/kernel/signal32.c | 1 +
arch/mips/kernel/signal_n32.c | 4 +-
arch/mips/kernel/signal_o32.c | 1 +
arch/mips/kernel/smp.c | 3 +
arch/mips/kernel/spram.c | 1 +
arch/mips/kernel/syscall.c | 1 +
arch/mips/kernel/traps.c | 2 -
arch/mips/kernel/unaligned.c | 1 +
arch/mips/mm/c-r4k.c | 6 +-
arch/mips/mm/cache.c | 6 -
arch/mips/mm/fault.c | 1 +
arch/mips/mm/init.c | 1 +
arch/mips/mm/pgtable-64.c | 2 +
arch/mips/mm/tlb-r3k.c | 4 +-
arch/mips/mm/tlb-r4k.c | 6 +-
arch/mips/power/cpu.c | 1 +
arch/mips/power/hibernate.c | 1 +
arch/powerpc/kexec/core_64.c | 3 +-
arch/powerpc/mm/book3s64/pgtable.c | 2 +
arch/s390/kernel/traps.c | 2 +
arch/sparc/kernel/Makefile | 1 -
arch/sparc/lib/Makefile | 1 -
arch/sparc/mm/Makefile | 1 -
arch/sparc/prom/Makefile | 1 -
arch/x86/pci/sta2x11-fixup.c | 1 +
drivers/platform/mips/rs780e-acpi.c | 12 +-
drivers/s390/block/dasd.c | 6 -
drivers/usb/host/fsl-mph-dr-of.c | 2 +-
fs/exec.c | 3 +-
fs/jffs2/debug.c | 2 +-
fs/nilfs2/btnode.c | 62 +++----
fs/nilfs2/dir.c | 244 +++++++++++--------------
fs/nilfs2/file.c | 28 +--
fs/nilfs2/gcinode.c | 4 +-
fs/nilfs2/inode.c | 11 +-
fs/nilfs2/ioctl.c | 10 +-
fs/nilfs2/mdt.c | 23 +--
fs/nilfs2/namei.c | 38 ++--
fs/nilfs2/nilfs.h | 20 +-
fs/nilfs2/page.c | 93 +++++-----
fs/nilfs2/page.h | 12 +-
fs/nilfs2/segment.c | 157 ++++++++--------
fs/squashfs/file.c | 3 +-
fs/squashfs/file_direct.c | 6 +-
include/linux/init_task.h | 7 -
include/linux/ioport.h | 3 +
include/linux/sched.h | 2 -
include/linux/sched/signal.h | 4 +-
init/init_task.c | 10 +-
kernel/fork.c | 26 ---
kernel/kexec_core.c | 5 +-
kernel/kexec_file.c | 2 +
kernel/ptrace.c | 13 +-
kernel/reboot.c | 17 +-
kernel/resource.c | 57 ++++++
kernel/sched/fair.c | 13 --
kernel/sched/sched.h | 11 ++
kernel/signal.c | 28 +--
kernel/watchdog.c | 3 +
lib/test_ida.c | 2 +-
scripts/checkpatch.pl | 2 +-
scripts/checkstack.pl | 19 +-
scripts/gdb/linux/page_owner.py | 58 +++---
scripts/gdb/linux/slab.py | 3 +-
scripts/gdb/linux/stackdepot.py | 6 +-
scripts/spelling.txt | 14 ++
114 files changed, 760 insertions(+), 616 deletions(-)
create mode 100644 arch/mips/boot/compressed/decompress.h
create mode 100644 arch/mips/include/asm/syscalls.h
Merging mm/mm-everything (a293b3ee2bd3 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
Merge made by the 'ort' strategy.
Documentation/ABI/testing/sysfs-firmware-initrd | 8 +
Documentation/admin-guide/cgroup-v2.rst | 12 +
Documentation/admin-guide/kernel-parameters.txt | 5 +-
Documentation/admin-guide/mm/transhuge.rst | 97 +++-
Documentation/admin-guide/mm/userfaultfd.rst | 3 +
Documentation/admin-guide/mm/zswap.rst | 6 +
Documentation/filesystems/proc.rst | 6 +-
arch/arm64/kernel/kexec_image.c | 6 +-
arch/arm64/kernel/machine_kexec.c | 26 +-
arch/arm64/kernel/machine_kexec_file.c | 12 +-
arch/parisc/kernel/kexec_file.c | 8 +-
arch/powerpc/kexec/elf_64.c | 8 +-
arch/powerpc/kexec/file_load_64.c | 18 +-
arch/riscv/kernel/Makefile | 2 +-
arch/riscv/kernel/elf_kexec.c | 11 +-
arch/riscv/kernel/machine_kexec.c | 26 -
arch/x86/kernel/crash.c | 4 +-
arch/x86/kernel/kexec-bzimage64.c | 23 +-
arch/x86/kernel/machine_kexec_64.c | 7 +-
drivers/rapidio/devices/tsi721.c | 67 ++-
drivers/rapidio/devices/tsi721_dma.c | 4 +-
fs/buffer.c | 130 ++---
fs/freevxfs/vxfs_bmap.c | 8 +-
fs/freevxfs/vxfs_immed.c | 2 +-
fs/freevxfs/vxfs_lookup.c | 3 +-
fs/nilfs2/sufile.c | 9 +-
fs/proc/task_mmu.c | 3 +-
fs/userfaultfd.c | 72 +++
include/linux/cpumask.h | 11 +
include/linux/find.h | 3 +
include/linux/huge_mm.h | 183 ++++++-
include/linux/kexec.h | 9 +-
include/linux/ksm.h | 6 +-
include/linux/memcontrol.h | 20 +-
include/linux/rmap.h | 7 +-
include/linux/swap.h | 9 +-
include/linux/userfaultfd_k.h | 11 +
include/linux/zswap.h | 6 +
include/uapi/linux/kexec.h | 1 +
include/uapi/linux/userfaultfd.h | 29 +-
init/Kconfig | 102 ++--
init/initramfs.c | 18 +-
kernel/crash_core.c | 9 +-
kernel/events/uprobes.c | 2 +-
kernel/fork.c | 2 +-
kernel/kexec_core.c | 6 +-
kernel/kexec_file.c | 14 +-
lib/Kconfig.debug | 4 -
lib/group_cpus.c | 47 +-
lib/maple_tree.c | 8 +-
mm/folio-compat.c | 16 -
mm/huge_memory.c | 351 +++++++++++++-
mm/khugepaged.c | 38 +-
mm/ksm.c | 21 +-
mm/memcontrol.c | 311 +++++++-----
mm/memory.c | 127 ++++-
mm/memremap.c | 18 +-
mm/migrate_device.c | 23 +-
mm/page_alloc.c | 44 +-
mm/page_io.c | 6 +
mm/page_vma_mapped.c | 3 +-
mm/rmap.c | 66 ++-
mm/shmem.c | 3 +-
mm/swapfile.c | 53 +-
mm/userfaultfd.c | 616 +++++++++++++++++++++++-
mm/vmscan.c | 26 +-
mm/workingset.c | 42 +-
mm/zswap.c | 20 +-
scripts/Makefile.extrawarn | 4 +-
security/integrity/ima/ima_kexec.c | 4 +-
tools/testing/radix-tree/maple.c | 6 +-
tools/testing/selftests/mm/Makefile | 4 +-
tools/testing/selftests/mm/cow.c | 185 ++++---
tools/testing/selftests/mm/khugepaged.c | 410 +++-------------
tools/testing/selftests/mm/run_vmtests.sh | 2 +
tools/testing/selftests/mm/thp_settings.c | 349 ++++++++++++++
tools/testing/selftests/mm/thp_settings.h | 80 +++
tools/testing/selftests/mm/uffd-common.c | 39 +-
tools/testing/selftests/mm/uffd-common.h | 9 +
tools/testing/selftests/mm/uffd-stress.c | 5 +-
tools/testing/selftests/mm/uffd-unit-tests.c | 192 ++++++++
usr/Kconfig | 6 +-
82 files changed, 3115 insertions(+), 1057 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-firmware-initrd
create mode 100644 tools/testing/selftests/mm/thp_settings.c
create mode 100644 tools/testing/selftests/mm/thp_settings.h
Merging kbuild/for-next (44028378399f gen_compile_commands.py: fix path resolve with symlinks in it)
$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next
Auto-merging MAINTAINERS
Auto-merging Makefile
Auto-merging scripts/Makefile.extrawarn
Auto-merging scripts/checkstack.pl
Auto-merging scripts/gdb/linux/tasks.py
Merge made by the 'ort' strategy.
.editorconfig | 32 ++++++
.gitignore | 1 +
Documentation/process/4.Coding.rst | 4 +
Documentation/process/coding-style.rst | 4 +
MAINTAINERS | 1 +
Makefile | 12 ++-
arch/sparc/vdso/Makefile | 18 +---
include/linux/export.h | 18 ----
include/linux/init.h | 7 ++
scripts/Makefile.extrawarn | 9 --
scripts/Makefile.lib | 4 +-
scripts/Makefile.package | 28 +----
scripts/checkstack.pl | 3 -
scripts/clang-tools/gen_compile_commands.py | 6 +-
scripts/gdb/linux/tasks.py | 15 +--
scripts/genksyms/genksyms.c | 22 +---
scripts/head-object-list.txt | 1 -
scripts/kconfig/Makefile | 14 ++-
scripts/kconfig/confdata.c | 158 +++++++++++++---------------
scripts/kconfig/expr.c | 1 -
scripts/kconfig/lkc.h | 3 -
scripts/kconfig/lkc_proto.h | 5 +
scripts/kconfig/mconf.c | 56 +---------
scripts/kconfig/menu.c | 19 +---
scripts/kconfig/mnconf-common.c | 53 ++++++++++
scripts/kconfig/mnconf-common.h | 18 ++++
scripts/kconfig/nconf.c | 55 +---------
scripts/kconfig/symbol.c | 28 ++---