Skip to content

Commit cc812ca

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.15.y' into v6.15+
2 parents 181bd87 + 7b59ab9 commit cc812ca

287 files changed

Lines changed: 4524 additions & 2532 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/devicetree/bindings/serial/8250.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ allOf:
4545
- ns16550
4646
- ns16550a
4747
then:
48-
anyOf:
48+
oneOf:
4949
- required: [ clock-frequency ]
5050
- required: [ clocks ]
5151

‎Documentation/netlink/specs/tc.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ definitions:
227227
type: u8
228228
doc: log(P_max / (qth-max - qth-min))
229229
-
230-
name: Scell_log
230+
name: Scell-log
231231
type: u8
232232
doc: cell size for idle damping
233233
-
@@ -248,7 +248,7 @@ definitions:
248248
name: DPs
249249
type: u32
250250
-
251-
name: def_DP
251+
name: def-DP
252252
type: u32
253253
-
254254
name: grio

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 15
4-
SUBLEVEL = 4
4+
SUBLEVEL = 5
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

0 commit comments

Comments
 (0)