Skip to content

Commit 16a6cbd

Browse files
committed
Merge remote-tracking branch 'stable/linux-5.15.y' into rpi-5.15.y
2 parents c8702c1 + 06f50ca commit 16a6cbd

File tree

956 files changed

+10040
-5127
lines changed

Some content is hidden

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

956 files changed

+10040
-5127
lines changed

Documentation/ABI/testing/sysfs-fs-f2fs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@ Description: Show status of f2fs superblock in real time.
425425
0x800 SBI_QUOTA_SKIP_FLUSH skip flushing quota in current CP
426426
0x1000 SBI_QUOTA_NEED_REPAIR quota file may be corrupted
427427
0x2000 SBI_IS_RESIZEFS resizefs is in process
428+
0x4000 SBI_IS_FREEZING freefs is in process
428429
====== ===================== =================================
429430

430431
What: /sys/fs/f2fs/<disk>/ckpt_thread_ioprio

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3452,8 +3452,7 @@
34523452
difficult since unequal pointers can no longer be
34533453
compared. However, if this command-line option is
34543454
specified, then all normal pointers will have their true
3455-
value printed. Pointers printed via %pK may still be
3456-
hashed. This option should only be specified when
3455+
value printed. This option should only be specified when
34573456
debugging the kernel. Please do not use on production
34583457
kernels.
34593458

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,7 @@ bit 1 print system memory info
795795
bit 2 print timer info
796796
bit 3 print locks info if ``CONFIG_LOCKDEP`` is on
797797
bit 4 print ftrace buffer
798+
bit 5 print all printk messages in buffer
798799
===== ============================================
799800

800801
So for example to print tasks and memory info on panic, user can::

Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ allOf:
106106
- mediatek,mt2701-smi-larb
107107
- mediatek,mt2712-smi-larb
108108
- mediatek,mt6779-smi-larb
109-
- mediatek,mt8167-smi-larb
110109
- mediatek,mt8192-smi-larb
111110

112111
then:

Documentation/devicetree/bindings/mtd/nand-controller.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ patternProperties:
5555
properties:
5656
reg:
5757
description:
58-
Contains the native Ready/Busy IDs.
58+
Contains the chip-select IDs.
5959

6060
nand-ecc-engine:
6161
allOf:
@@ -184,7 +184,7 @@ examples:
184184
nand-use-soft-ecc-engine;
185185
nand-ecc-algo = "bch";
186186
187-
/* controller specific properties */
187+
/* NAND chip specific properties */
188188
};
189189
190190
nand@1 {

Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ examples:
138138
clocks = <&sys_clk>;
139139
pinctrl-0 = <&sgpio2_pins>;
140140
pinctrl-names = "default";
141-
reg = <0x1101059c 0x100>;
141+
reg = <0x1101059c 0x118>;
142142
microchip,sgpio-port-ranges = <0 0>, <16 18>, <28 31>;
143143
bus-frequency = <25000000>;
144144
sgpio_in2: gpio@0 {

Documentation/devicetree/bindings/spi/nvidia,tegra210-quad.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ examples:
106106
dma-names = "rx", "tx";
107107
108108
flash@0 {
109-
compatible = "spi-nor";
109+
compatible = "jedec,spi-nor";
110110
reg = <0>;
111111
spi-max-frequency = <104000000>;
112112
spi-tx-bus-width = <2>;

Documentation/devicetree/bindings/spi/spi-mxic.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ Required properties:
88
- reg: should contain 2 entries, one for the registers and one for the direct
99
mapping area
1010
- reg-names: should contain "regs" and "dirmap"
11-
- interrupts: interrupt line connected to the SPI controller
1211
- clock-names: should contain "ps_clk", "send_clk" and "send_dly_clk"
1312
- clocks: should contain 3 entries for the "ps_clk", "send_clk" and
1413
"send_dly_clk" clocks
1514

15+
Optional properties:
16+
- interrupts: interrupt line connected to the SPI controller
17+
1618
Example:
1719

1820
spi@43c30000 {

Documentation/devicetree/bindings/usb/usb-hcd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ patternProperties:
3333
"^.*@[0-9a-f]{1,2}$":
3434
description: The hard wired USB devices
3535
type: object
36-
$ref: /usb/usb-device.yaml
36+
$ref: /schemas/usb/usb-device.yaml
3737

3838
additionalProperties: true
3939

Documentation/process/stable-kernel-rules.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,16 @@ Trees
168168
- The finalized and tagged releases of all stable kernels can be found
169169
in separate branches per version at:
170170

171-
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
171+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
172+
173+
- The release candidate of all stable kernel versions can be found at:
174+
175+
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/
176+
177+
.. warning::
178+
The -stable-rc tree is a snapshot in time of the stable-queue tree and
179+
will change frequently, hence will be rebased often. It should only be
180+
used for testing purposes (e.g. to be consumed by CI systems).
172181

173182

174183
Review committee

0 commit comments

Comments
 (0)