Skip to content

Commit d065335

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.23' into 6.6-main
Linux 6.6.23 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAmYDTh8ACgkQ3qZv95d3 # LNzBbhAAwSqAoBZBxApda8QQEVvF012dZG0btn0wJv2H3Bu8wasAhfD2pD5LxFZf # Ru3EVgrBeupMKhZk/aeN5d2qSxn5mCiU4WnAwqDvjtsIicjmeeRaqcGGFFmZ6TyM # KrK+NjxHu77L6dlkMZRLRugP/7WGGUI3G0fGj2HvJOlMRFHJSx8o4JeX1Yc10xDz # MbySZBj4ZctjvP16dxehA44Grw08CTxnoPgrHn52TgncLGuQfcx+w+fXEDJfdRzP # vS8D+8C4G8iwjyfKLnb/jytZR0jlVii3DkQXcIjUzGRQ4UEhfzvSn9C07zu80cPV # iskQCo/IS1/2gD5M6OgVOjfR0yfF/NCOm692omEH6oQHjNu6QOxM2PpFpIYzm34r # /4wnTMg58AMsNGp/D5bipl3X5B93pWDoCLq939ZU9688EaR1n/Xsh5+EXG0lKIux # Eb4tk2z7zJt54/UQM+J2qhtJrqriflSl1dTBxpuZb2abUrq5ewQgNyqhb0hXBc5f # F5SU5O+dkntQGcUQ1GBSWk5B5q8oXmqY9reIeuhhRYI0w0Y+Xt+jeQHhQSU0j7ne # DLv5uG32HTR9p8z1jidJJY8VL3MuCpMzrfFkZsEUEut0haF8FhpGIxZ+YjNYcgRt # f57z1Sf5Gzr+fpM1q8TesHI8+7MEh7Fel+elyWpvnidJfMNx4t8= # =mu/j # -----END PGP SIGNATURE----- # gpg: Signature made Tue Mar 26 23:37:19 2024 CET # gpg: using RSA key E27E5D8A3403A2EF66873BBCDEA66FF797772CDC # gpg: Can't check signature: No public key
2 parents 1db28dc + 5c7587f commit d065335

File tree

711 files changed

+6443
-7107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

711 files changed

+6443
-7107
lines changed

‎Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ patternProperties:
127127
- qcom,dsi-phy-20nm
128128
- qcom,dsi-phy-28nm-8226
129129
- qcom,dsi-phy-28nm-hpm
130+
- qcom,dsi-phy-28nm-hpm-fam-b
130131
- qcom,dsi-phy-28nm-lp
131132
- qcom,hdmi-phy-8084
132133
- qcom,hdmi-phy-8660

‎Documentation/filesystems/overlayfs.rst

+14-3
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,11 @@ escaping the colons with a single backslash. For example:
344344

345345
mount -t overlay overlay -olowerdir=/a\:lower\:\:dir /merged
346346

347-
Since kernel version v6.5, directory names containing colons can also
348-
be provided as lower layer using the fsconfig syscall from new mount api:
347+
Since kernel version v6.8, directory names containing colons can also
348+
be configured as lower layer using the "lowerdir+" mount options and the
349+
fsconfig syscall from new mount api. For example:
349350

350-
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir", "/a:lower::dir", 0);
351+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/a:lower::dir", 0);
351352

352353
In the latter case, colons in lower layer directory names will be escaped
353354
as an octal characters (\072) when displayed in /proc/self/mountinfo.
@@ -416,6 +417,16 @@ Only the data of the files in the "data-only" lower layers may be visible
416417
when a "metacopy" file in one of the lower layers above it, has a "redirect"
417418
to the absolute path of the "lower data" file in the "data-only" lower layer.
418419

420+
Since kernel version v6.8, "data-only" lower layers can also be added using
421+
the "datadir+" mount options and the fsconfig syscall from new mount api.
422+
For example:
423+
424+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l1", 0);
425+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l2", 0);
426+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l3", 0);
427+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "datadir+", "/do1", 0);
428+
fsconfig(fs_fd, FSCONFIG_SET_STRING, "datadir+", "/do2", 0);
429+
419430

420431
fs-verity support
421432
----------------------

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 22
4+
SUBLEVEL = 23
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/arm/boot/dts/amazon/alpine.dtsi

-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,6 @@
167167
msix: msix@fbe00000 {
168168
compatible = "al,alpine-msix";
169169
reg = <0x0 0xfbe00000 0x0 0x100000>;
170-
interrupt-controller;
171170
msi-controller;
172171
al,msi-base-spi = <96>;
173172
al,msi-num-spis = <64>;

‎arch/arm/boot/dts/arm/arm-realview-pb1176.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451

452452
/* Direct-mapped development chip ROM */
453453
pb1176_rom@10200000 {
454-
compatible = "direct-mapped";
454+
compatible = "mtd-rom";
455455
reg = <0x10200000 0x4000>;
456456
bank-width = <1>;
457457
};

‎arch/arm/boot/dts/aspeed/aspeed-g4.dtsi

-14
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466
i2c0: i2c-bus@40 {
467467
#address-cells = <1>;
468468
#size-cells = <0>;
469-
#interrupt-cells = <1>;
470469

471470
reg = <0x40 0x40>;
472471
compatible = "aspeed,ast2400-i2c-bus";
@@ -482,7 +481,6 @@
482481
i2c1: i2c-bus@80 {
483482
#address-cells = <1>;
484483
#size-cells = <0>;
485-
#interrupt-cells = <1>;
486484

487485
reg = <0x80 0x40>;
488486
compatible = "aspeed,ast2400-i2c-bus";
@@ -498,7 +496,6 @@
498496
i2c2: i2c-bus@c0 {
499497
#address-cells = <1>;
500498
#size-cells = <0>;
501-
#interrupt-cells = <1>;
502499

503500
reg = <0xc0 0x40>;
504501
compatible = "aspeed,ast2400-i2c-bus";
@@ -515,7 +512,6 @@
515512
i2c3: i2c-bus@100 {
516513
#address-cells = <1>;
517514
#size-cells = <0>;
518-
#interrupt-cells = <1>;
519515

520516
reg = <0x100 0x40>;
521517
compatible = "aspeed,ast2400-i2c-bus";
@@ -532,7 +528,6 @@
532528
i2c4: i2c-bus@140 {
533529
#address-cells = <1>;
534530
#size-cells = <0>;
535-
#interrupt-cells = <1>;
536531

537532
reg = <0x140 0x40>;
538533
compatible = "aspeed,ast2400-i2c-bus";
@@ -549,7 +544,6 @@
549544
i2c5: i2c-bus@180 {
550545
#address-cells = <1>;
551546
#size-cells = <0>;
552-
#interrupt-cells = <1>;
553547

554548
reg = <0x180 0x40>;
555549
compatible = "aspeed,ast2400-i2c-bus";
@@ -566,7 +560,6 @@
566560
i2c6: i2c-bus@1c0 {
567561
#address-cells = <1>;
568562
#size-cells = <0>;
569-
#interrupt-cells = <1>;
570563

571564
reg = <0x1c0 0x40>;
572565
compatible = "aspeed,ast2400-i2c-bus";
@@ -583,7 +576,6 @@
583576
i2c7: i2c-bus@300 {
584577
#address-cells = <1>;
585578
#size-cells = <0>;
586-
#interrupt-cells = <1>;
587579

588580
reg = <0x300 0x40>;
589581
compatible = "aspeed,ast2400-i2c-bus";
@@ -600,7 +592,6 @@
600592
i2c8: i2c-bus@340 {
601593
#address-cells = <1>;
602594
#size-cells = <0>;
603-
#interrupt-cells = <1>;
604595

605596
reg = <0x340 0x40>;
606597
compatible = "aspeed,ast2400-i2c-bus";
@@ -617,7 +608,6 @@
617608
i2c9: i2c-bus@380 {
618609
#address-cells = <1>;
619610
#size-cells = <0>;
620-
#interrupt-cells = <1>;
621611

622612
reg = <0x380 0x40>;
623613
compatible = "aspeed,ast2400-i2c-bus";
@@ -634,7 +624,6 @@
634624
i2c10: i2c-bus@3c0 {
635625
#address-cells = <1>;
636626
#size-cells = <0>;
637-
#interrupt-cells = <1>;
638627

639628
reg = <0x3c0 0x40>;
640629
compatible = "aspeed,ast2400-i2c-bus";
@@ -651,7 +640,6 @@
651640
i2c11: i2c-bus@400 {
652641
#address-cells = <1>;
653642
#size-cells = <0>;
654-
#interrupt-cells = <1>;
655643

656644
reg = <0x400 0x40>;
657645
compatible = "aspeed,ast2400-i2c-bus";
@@ -668,7 +656,6 @@
668656
i2c12: i2c-bus@440 {
669657
#address-cells = <1>;
670658
#size-cells = <0>;
671-
#interrupt-cells = <1>;
672659

673660
reg = <0x440 0x40>;
674661
compatible = "aspeed,ast2400-i2c-bus";
@@ -685,7 +672,6 @@
685672
i2c13: i2c-bus@480 {
686673
#address-cells = <1>;
687674
#size-cells = <0>;
688-
#interrupt-cells = <1>;
689675

690676
reg = <0x480 0x40>;
691677
compatible = "aspeed,ast2400-i2c-bus";

‎arch/arm/boot/dts/aspeed/aspeed-g5.dtsi

+1-14
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
interrupts = <40>;
364364
reg = <0x1e780200 0x0100>;
365365
clocks = <&syscon ASPEED_CLK_APB>;
366+
#interrupt-cells = <2>;
366367
interrupt-controller;
367368
bus-frequency = <12000000>;
368369
pinctrl-names = "default";
@@ -594,7 +595,6 @@
594595
i2c0: i2c-bus@40 {
595596
#address-cells = <1>;
596597
#size-cells = <0>;
597-
#interrupt-cells = <1>;
598598

599599
reg = <0x40 0x40>;
600600
compatible = "aspeed,ast2500-i2c-bus";
@@ -610,7 +610,6 @@
610610
i2c1: i2c-bus@80 {
611611
#address-cells = <1>;
612612
#size-cells = <0>;
613-
#interrupt-cells = <1>;
614613

615614
reg = <0x80 0x40>;
616615
compatible = "aspeed,ast2500-i2c-bus";
@@ -626,7 +625,6 @@
626625
i2c2: i2c-bus@c0 {
627626
#address-cells = <1>;
628627
#size-cells = <0>;
629-
#interrupt-cells = <1>;
630628

631629
reg = <0xc0 0x40>;
632630
compatible = "aspeed,ast2500-i2c-bus";
@@ -643,7 +641,6 @@
643641
i2c3: i2c-bus@100 {
644642
#address-cells = <1>;
645643
#size-cells = <0>;
646-
#interrupt-cells = <1>;
647644

648645
reg = <0x100 0x40>;
649646
compatible = "aspeed,ast2500-i2c-bus";
@@ -660,7 +657,6 @@
660657
i2c4: i2c-bus@140 {
661658
#address-cells = <1>;
662659
#size-cells = <0>;
663-
#interrupt-cells = <1>;
664660

665661
reg = <0x140 0x40>;
666662
compatible = "aspeed,ast2500-i2c-bus";
@@ -677,7 +673,6 @@
677673
i2c5: i2c-bus@180 {
678674
#address-cells = <1>;
679675
#size-cells = <0>;
680-
#interrupt-cells = <1>;
681676

682677
reg = <0x180 0x40>;
683678
compatible = "aspeed,ast2500-i2c-bus";
@@ -694,7 +689,6 @@
694689
i2c6: i2c-bus@1c0 {
695690
#address-cells = <1>;
696691
#size-cells = <0>;
697-
#interrupt-cells = <1>;
698692

699693
reg = <0x1c0 0x40>;
700694
compatible = "aspeed,ast2500-i2c-bus";
@@ -711,7 +705,6 @@
711705
i2c7: i2c-bus@300 {
712706
#address-cells = <1>;
713707
#size-cells = <0>;
714-
#interrupt-cells = <1>;
715708

716709
reg = <0x300 0x40>;
717710
compatible = "aspeed,ast2500-i2c-bus";
@@ -728,7 +721,6 @@
728721
i2c8: i2c-bus@340 {
729722
#address-cells = <1>;
730723
#size-cells = <0>;
731-
#interrupt-cells = <1>;
732724

733725
reg = <0x340 0x40>;
734726
compatible = "aspeed,ast2500-i2c-bus";
@@ -745,7 +737,6 @@
745737
i2c9: i2c-bus@380 {
746738
#address-cells = <1>;
747739
#size-cells = <0>;
748-
#interrupt-cells = <1>;
749740

750741
reg = <0x380 0x40>;
751742
compatible = "aspeed,ast2500-i2c-bus";
@@ -762,7 +753,6 @@
762753
i2c10: i2c-bus@3c0 {
763754
#address-cells = <1>;
764755
#size-cells = <0>;
765-
#interrupt-cells = <1>;
766756

767757
reg = <0x3c0 0x40>;
768758
compatible = "aspeed,ast2500-i2c-bus";
@@ -779,7 +769,6 @@
779769
i2c11: i2c-bus@400 {
780770
#address-cells = <1>;
781771
#size-cells = <0>;
782-
#interrupt-cells = <1>;
783772

784773
reg = <0x400 0x40>;
785774
compatible = "aspeed,ast2500-i2c-bus";
@@ -796,7 +785,6 @@
796785
i2c12: i2c-bus@440 {
797786
#address-cells = <1>;
798787
#size-cells = <0>;
799-
#interrupt-cells = <1>;
800788

801789
reg = <0x440 0x40>;
802790
compatible = "aspeed,ast2500-i2c-bus";
@@ -813,7 +801,6 @@
813801
i2c13: i2c-bus@480 {
814802
#address-cells = <1>;
815803
#size-cells = <0>;
816-
#interrupt-cells = <1>;
817804

818805
reg = <0x480 0x40>;
819806
compatible = "aspeed,ast2500-i2c-bus";

0 commit comments

Comments
 (0)