Skip to content

Commit

Permalink
Merge tag 'v6.6.23' into 6.6-main
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@frank-w
frank-w committed Mar 29, 2024
2 parents 1db28dc + 5c7587f commit d065335
Show file tree
Hide file tree
Showing 711 changed files with 6,443 additions and 7,107 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/display/msm/qcom,mdss.yaml
View file
Expand Up @@ -127,6 +127,7 @@ patternProperties:
- qcom,dsi-phy-20nm
- qcom,dsi-phy-28nm-8226
- qcom,dsi-phy-28nm-hpm
- qcom,dsi-phy-28nm-hpm-fam-b
- qcom,dsi-phy-28nm-lp
- qcom,hdmi-phy-8084
- qcom,hdmi-phy-8660
Expand Down
17 changes: 14 additions & 3 deletions Documentation/filesystems/overlayfs.rst
View file
Expand Up @@ -344,10 +344,11 @@ escaping the colons with a single backslash. For example:

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

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

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

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

Since kernel version v6.8, "data-only" lower layers can also be added using
the "datadir+" mount options and the fsconfig syscall from new mount api.
For example:

fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l1", 0);
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l2", 0);
fsconfig(fs_fd, FSCONFIG_SET_STRING, "lowerdir+", "/l3", 0);
fsconfig(fs_fd, FSCONFIG_SET_STRING, "datadir+", "/do1", 0);
fsconfig(fs_fd, FSCONFIG_SET_STRING, "datadir+", "/do2", 0);


fs-verity support
----------------------
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 6
SUBLEVEL = 22
SUBLEVEL = 23
EXTRAVERSION =
NAME = Hurr durr I'ma ninja sloth

Expand Down
1 change: 0 additions & 1 deletion arch/arm/boot/dts/amazon/alpine.dtsi
View file
Expand Up @@ -167,7 +167,6 @@
msix: msix@fbe00000 {
compatible = "al,alpine-msix";
reg = <0x0 0xfbe00000 0x0 0x100000>;
interrupt-controller;
msi-controller;
al,msi-base-spi = <96>;
al,msi-num-spis = <64>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/arm/arm-realview-pb1176.dts
View file
Expand Up @@ -451,7 +451,7 @@

/* Direct-mapped development chip ROM */
pb1176_rom@10200000 {
compatible = "direct-mapped";
compatible = "mtd-rom";
reg = <0x10200000 0x4000>;
bank-width = <1>;
};
Expand Down
14 changes: 0 additions & 14 deletions arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
View file
Expand Up @@ -466,7 +466,6 @@
i2c0: i2c-bus@40 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x40 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -482,7 +481,6 @@
i2c1: i2c-bus@80 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x80 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -498,7 +496,6 @@
i2c2: i2c-bus@c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0xc0 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -515,7 +512,6 @@
i2c3: i2c-bus@100 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x100 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -532,7 +528,6 @@
i2c4: i2c-bus@140 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x140 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -549,7 +544,6 @@
i2c5: i2c-bus@180 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x180 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -566,7 +560,6 @@
i2c6: i2c-bus@1c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x1c0 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -583,7 +576,6 @@
i2c7: i2c-bus@300 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x300 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -600,7 +592,6 @@
i2c8: i2c-bus@340 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x340 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -617,7 +608,6 @@
i2c9: i2c-bus@380 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x380 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -634,7 +624,6 @@
i2c10: i2c-bus@3c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x3c0 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -651,7 +640,6 @@
i2c11: i2c-bus@400 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x400 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -668,7 +656,6 @@
i2c12: i2c-bus@440 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x440 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand All @@ -685,7 +672,6 @@
i2c13: i2c-bus@480 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x480 0x40>;
compatible = "aspeed,ast2400-i2c-bus";
Expand Down
15 changes: 1 addition & 14 deletions arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
View file
Expand Up @@ -363,6 +363,7 @@
interrupts = <40>;
reg = <0x1e780200 0x0100>;
clocks = <&syscon ASPEED_CLK_APB>;
#interrupt-cells = <2>;
interrupt-controller;
bus-frequency = <12000000>;
pinctrl-names = "default";
Expand Down Expand Up @@ -594,7 +595,6 @@
i2c0: i2c-bus@40 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x40 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -610,7 +610,6 @@
i2c1: i2c-bus@80 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x80 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -626,7 +625,6 @@
i2c2: i2c-bus@c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0xc0 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -643,7 +641,6 @@
i2c3: i2c-bus@100 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x100 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -660,7 +657,6 @@
i2c4: i2c-bus@140 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x140 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -677,7 +673,6 @@
i2c5: i2c-bus@180 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x180 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -694,7 +689,6 @@
i2c6: i2c-bus@1c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x1c0 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -711,7 +705,6 @@
i2c7: i2c-bus@300 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x300 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -728,7 +721,6 @@
i2c8: i2c-bus@340 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x340 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -745,7 +737,6 @@
i2c9: i2c-bus@380 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x380 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -762,7 +753,6 @@
i2c10: i2c-bus@3c0 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x3c0 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -779,7 +769,6 @@
i2c11: i2c-bus@400 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x400 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -796,7 +785,6 @@
i2c12: i2c-bus@440 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

reg = <0x440 0x40>;
compatible = "aspeed,ast2500-i2c-bus";
Expand All @@ -813,7 +801,6 @@
i2c13: i2c-bus@480 {
#address-cells = <1>;
#size-cells = <0>;
#interrupt-cells = <1>;

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

0 comments on commit d065335

Please sign in to comment.