Skip to content

Commit 8a24fcd

Browse files
erickshepherdNIerickshepherdNI
committed
Merge tag 'v6.12.66-rt15' into nilrt/master/6.12
v6.12.66-rt15 Resolved a merge conflict between 426f4a9 and 61fcb98 by keeping the formatting changes from upstream while continuing to use the dwc3_pci_intel_bxt_swnode node from our patch for BXT, BXT_M, and APL in the dwc3_pci_id_table. Signed-off-by: Erick Shepherd <erick.shepherd@ni.com>
2 parents 31bc38e + 682cc16 commit 8a24fcd

2,076 files changed

Lines changed: 21992 additions & 38679 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-fs-f2fs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -828,3 +828,55 @@ Date: November 2024
828828
Contact: "Chao Yu" <chao@kernel.org>
829829
Description: It controls max read extent count for per-inode, the value of threshold
830830
is 10240 by default.
831+
832+
What: /sys/fs/f2fs/tuning/reclaim_caches_kb
833+
Date: February 2025
834+
Contact: "Jaegeuk Kim" <jaegeuk@kernel.org>
835+
Description: It reclaims the given KBs of file-backed pages registered by
836+
ioctl(F2FS_IOC_DONATE_RANGE).
837+
For example, writing N tries to drop N KBs spaces in LRU.
838+
839+
What: /sys/fs/f2fs/<disk>/carve_out
840+
Date: March 2025
841+
Contact: "Daeho Jeong" <daehojeong@google.com>
842+
Description: For several zoned storage devices, vendors will provide extra space which
843+
was used for device level GC than specs and F2FS can use this space for
844+
filesystem level GC. To do that, we can reserve the space using
845+
reserved_blocks. However, it is not enough, since this extra space should
846+
not be shown to users. So, with this new sysfs node, we can hide the space
847+
by substracting reserved_blocks from total bytes.
848+
849+
What: /sys/fs/f2fs/<disk>/encoding_flags
850+
Date: April 2025
851+
Contact: "Chao Yu" <chao@kernel.org>
852+
Description: This is a read-only entry to show the value of sb.s_encoding_flags, the
853+
value is hexadecimal.
854+
855+
============================ ==========
856+
Flag_Name Flag_Value
857+
============================ ==========
858+
SB_ENC_STRICT_MODE_FL 0x00000001
859+
SB_ENC_NO_COMPAT_FALLBACK_FL 0x00000002
860+
============================ ==========
861+
862+
What: /sys/fs/f2fs/<disk>/reserved_pin_section
863+
Date: June 2025
864+
Contact: "Chao Yu" <chao@kernel.org>
865+
Description: This threshold is used to control triggering garbage collection while
866+
fallocating on pinned file, so, it can guarantee there is enough free
867+
reserved section before preallocating on pinned file.
868+
By default, the value is ovp_sections, especially, for zoned ufs, the
869+
value is 1.
870+
871+
What: /sys/fs/f2fs/<disk>/gc_boost_gc_multiple
872+
Date: June 2025
873+
Contact: "Daeho Jeong" <daehojeong@google.com>
874+
Description: Set a multiplier for the background GC migration window when F2FS GC is
875+
boosted. The range should be from 1 to the segment count in a section.
876+
Default: 5
877+
878+
What: /sys/fs/f2fs/<disk>/gc_boost_gc_greedy
879+
Date: June 2025
880+
Contact: "Daeho Jeong" <daehojeong@google.com>
881+
Description: Control GC algorithm for boost GC. 0: cost benefit, 1: greedy
882+
Default: 1

‎Documentation/admin-guide/LSM/Smack.rst‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -601,10 +601,15 @@ specification.
601601
Task Attribute
602602
~~~~~~~~~~~~~~
603603

604-
The Smack label of a process can be read from /proc/<pid>/attr/current. A
605-
process can read its own Smack label from /proc/self/attr/current. A
604+
The Smack label of a process can be read from ``/proc/<pid>/attr/current``. A
605+
process can read its own Smack label from ``/proc/self/attr/current``. A
606606
privileged process can change its own Smack label by writing to
607-
/proc/self/attr/current but not the label of another process.
607+
``/proc/self/attr/current`` but not the label of another process.
608+
609+
Format of writing is : only the label or the label followed by one of the
610+
3 trailers: ``\n`` (by common agreement for ``/proc/...`` interfaces),
611+
``\0`` (because some applications incorrectly include it),
612+
``\n\0`` (because we think some applications may incorrectly include it).
608613

609614
File Attribute
610615
~~~~~~~~~~~~~~
@@ -696,6 +701,11 @@ sockets.
696701
A privileged program may set this to match the label of another
697702
task with which it hopes to communicate.
698703

704+
UNIX domain socket (UDS) with a BSD address functions both as a file in a
705+
filesystem and as a socket. As a file, it carries the SMACK64 attribute. This
706+
attribute is not involved in Smack security enforcement and is immutably
707+
assigned the label "*".
708+
699709
Smack Netlabel Exceptions
700710
~~~~~~~~~~~~~~~~~~~~~~~~~
701711

‎Documentation/devicetree/bindings/clock/qcom,x1e80100-gcc.yaml‎

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,36 @@ properties:
2828
- description: PCIe 5 pipe clock
2929
- description: PCIe 6a pipe clock
3030
- description: PCIe 6b pipe clock
31-
- description: USB QMP Phy 0 clock source
32-
- description: USB QMP Phy 1 clock source
33-
- description: USB QMP Phy 2 clock source
31+
- description: USB4_0 QMPPHY clock source
32+
- description: USB4_1 QMPPHY clock source
33+
- description: USB4_2 QMPPHY clock source
34+
- description: USB4_0 PHY DP0 GMUX clock source
35+
- description: USB4_0 PHY DP1 GMUX clock source
36+
- description: USB4_0 PHY PCIE PIPEGMUX clock source
37+
- description: USB4_0 PHY PIPEGMUX clock source
38+
- description: USB4_0 PHY SYS PCIE PIPEGMUX clock source
39+
- description: USB4_1 PHY DP0 GMUX 2 clock source
40+
- description: USB4_1 PHY DP1 GMUX 2 clock source
41+
- description: USB4_1 PHY PCIE PIPEGMUX clock source
42+
- description: USB4_1 PHY PIPEGMUX clock source
43+
- description: USB4_1 PHY SYS PCIE PIPEGMUX clock source
44+
- description: USB4_2 PHY DP0 GMUX 2 clock source
45+
- description: USB4_2 PHY DP1 GMUX 2 clock source
46+
- description: USB4_2 PHY PCIE PIPEGMUX clock source
47+
- description: USB4_2 PHY PIPEGMUX clock source
48+
- description: USB4_2 PHY SYS PCIE PIPEGMUX clock source
49+
- description: USB4_0 PHY RX 0 clock source
50+
- description: USB4_0 PHY RX 1 clock source
51+
- description: USB4_1 PHY RX 0 clock source
52+
- description: USB4_1 PHY RX 1 clock source
53+
- description: USB4_2 PHY RX 0 clock source
54+
- description: USB4_2 PHY RX 1 clock source
55+
- description: USB4_0 PHY PCIE PIPE clock source
56+
- description: USB4_0 PHY max PIPE clock source
57+
- description: USB4_1 PHY PCIE PIPE clock source
58+
- description: USB4_1 PHY max PIPE clock source
59+
- description: USB4_2 PHY PCIE PIPE clock source
60+
- description: USB4_2 PHY max PIPE clock source
3461

3562
power-domains:
3663
description:
@@ -63,7 +90,34 @@ examples:
6390
<&pcie6b_phy>,
6491
<&usb_1_ss0_qmpphy 0>,
6592
<&usb_1_ss1_qmpphy 1>,
66-
<&usb_1_ss2_qmpphy 2>;
93+
<&usb_1_ss2_qmpphy 2>,
94+
<&usb4_0_phy_dp0_gmux_clk>,
95+
<&usb4_0_phy_dp1_gmux_clk>,
96+
<&usb4_0_phy_pcie_pipegmux_clk>,
97+
<&usb4_0_phy_pipegmux_clk>,
98+
<&usb4_0_phy_sys_pcie_pipegmux_clk>,
99+
<&usb4_1_phy_dp0_gmux_2_clk>,
100+
<&usb4_1_phy_dp1_gmux_2_clk>,
101+
<&usb4_1_phy_pcie_pipegmux_clk>,
102+
<&usb4_1_phy_pipegmux_clk>,
103+
<&usb4_1_phy_sys_pcie_pipegmux_clk>,
104+
<&usb4_2_phy_dp0_gmux_2_clk>,
105+
<&usb4_2_phy_dp1_gmux_2_clk>,
106+
<&usb4_2_phy_pcie_pipegmux_clk>,
107+
<&usb4_2_phy_pipegmux_clk>,
108+
<&usb4_2_phy_sys_pcie_pipegmux_clk>,
109+
<&usb4_0_phy_rx_0_clk>,
110+
<&usb4_0_phy_rx_1_clk>,
111+
<&usb4_1_phy_rx_0_clk>,
112+
<&usb4_1_phy_rx_1_clk>,
113+
<&usb4_2_phy_rx_0_clk>,
114+
<&usb4_2_phy_rx_1_clk>,
115+
<&usb4_0_phy_pcie_pipe_clk>,
116+
<&usb4_0_phy_max_pipe_clk>,
117+
<&usb4_1_phy_pcie_pipe_clk>,
118+
<&usb4_1_phy_max_pipe_clk>,
119+
<&usb4_2_phy_pcie_pipe_clk>,
120+
<&usb4_2_phy_max_pipe_clk>;
67121
power-domains = <&rpmhpd RPMHPD_CX>;
68122
#clock-cells = <1>;
69123
#reset-cells = <1>;

‎Documentation/devicetree/bindings/mmc/aspeed,sdhci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ properties:
4141
patternProperties:
4242
"^sdhci@[0-9a-f]+$":
4343
type: object
44-
$ref: mmc-controller.yaml
44+
$ref: sdhci-common.yaml
4545
unevaluatedProperties: false
4646

4747
properties:

‎Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ properties:
3636

3737
reg:
3838
items:
39-
- description: External local bus interface registers
39+
- description: Data Bus Interface registers
4040
- description: Meson designed configuration registers
4141
- description: PCIe configuration space
4242

4343
reg-names:
4444
items:
45-
- const: elbi
45+
- const: dbi
4646
- const: cfg
4747
- const: config
4848

@@ -113,7 +113,7 @@ examples:
113113
pcie: pcie@f9800000 {
114114
compatible = "amlogic,axg-pcie", "snps,dw-pcie";
115115
reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>;
116-
reg-names = "elbi", "cfg", "config";
116+
reg-names = "dbi", "cfg", "config";
117117
interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>;
118118
clocks = <&pclk>, <&clk_port>, <&clk_phy>;
119119
clock-names = "pclk", "port", "general";

‎Documentation/devicetree/bindings/pci/qcom,pcie-sc7280.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ properties:
7474
items:
7575
- const: pci
7676

77+
required:
78+
- power-domains
79+
- resets
80+
- reset-names
81+
7782
allOf:
7883
- $ref: qcom,pcie-common.yaml#
7984

‎Documentation/devicetree/bindings/pci/qcom,pcie-sc8280xp.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ properties:
6161
required:
6262
- interconnects
6363
- interconnect-names
64+
- power-domains
65+
- resets
66+
- reset-names
6467

6568
allOf:
6669
- $ref: qcom,pcie-common.yaml#

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8150.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ properties:
6969
items:
7070
- const: pci
7171

72+
required:
73+
- power-domains
74+
- resets
75+
- reset-names
76+
7277
allOf:
7378
- $ref: qcom,pcie-common.yaml#
7479

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8250.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,11 @@ properties:
8181
items:
8282
- const: pci
8383

84+
required:
85+
- power-domains
86+
- resets
87+
- reset-names
88+
8489
allOf:
8590
- $ref: qcom,pcie-common.yaml#
8691

‎Documentation/devicetree/bindings/pci/qcom,pcie-sm8350.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ properties:
7171
items:
7272
- const: pci
7373

74+
required:
75+
- power-domains
76+
- resets
77+
- reset-names
78+
7479
allOf:
7580
- $ref: qcom,pcie-common.yaml#
7681

0 commit comments

Comments
 (0)