Skip to content

Commit 3082899

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.8.y' into v6.8+
2 parents 59901e2 + 03a22b5 commit 3082899

718 files changed

Lines changed: 8672 additions & 7569 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/display/msm/qcom,mdss.yaml‎

Lines changed: 1 addition & 0 deletions
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/devicetree/bindings/iommu/arm,smmu.yaml‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,12 @@ allOf:
484484
- if:
485485
properties:
486486
compatible:
487-
const: qcom,sm8450-smmu-500
487+
items:
488+
- const: qcom,sm8450-smmu-500
489+
- const: qcom,adreno-smmu
490+
- const: qcom,smmu-500
491+
- const: arm,mmu-500
492+
488493
then:
489494
properties:
490495
clock-names:
@@ -508,7 +513,11 @@ allOf:
508513
- if:
509514
properties:
510515
compatible:
511-
const: qcom,sm8550-smmu-500
516+
items:
517+
- const: qcom,sm8550-smmu-500
518+
- const: qcom,adreno-smmu
519+
- const: qcom,smmu-500
520+
- const: arm,mmu-500
512521
then:
513522
properties:
514523
clock-names:

‎Documentation/devicetree/bindings/media/i2c/techwell,tw9900.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ properties:
3636

3737
properties:
3838
port@0:
39-
$ref: /schemas/graph.yaml#/$defs/port-base
39+
$ref: /schemas/graph.yaml#/properties/port
4040
description: Analog input port
4141

4242
properties:

‎Documentation/driver-api/soundwire/stream.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,12 +324,12 @@ framework, this stream state is linked to .hw_params() operation.
324324
325325
int sdw_stream_add_master(struct sdw_bus * bus,
326326
struct sdw_stream_config * stream_config,
327-
struct sdw_ports_config * ports_config,
327+
const struct sdw_ports_config * ports_config,
328328
struct sdw_stream_runtime * stream);
329329
330330
int sdw_stream_add_slave(struct sdw_slave * slave,
331331
struct sdw_stream_config * stream_config,
332-
struct sdw_ports_config * ports_config,
332+
const struct sdw_ports_config * ports_config,
333333
struct sdw_stream_runtime * stream);
334334
335335

‎Documentation/netlink/specs/devlink.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ attribute-sets:
290290
enum: eswitch-mode
291291
-
292292
name: eswitch-inline-mode
293-
type: u16
293+
type: u8
294294
enum: eswitch-inline-mode
295295
-
296296
name: dpipe-tables

‎Documentation/netlink/specs/dpll.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ attribute-sets:
274274
-
275275
name: capabilities
276276
type: u32
277+
enum: pin-capabilities
277278
-
278279
name: parent-device
279280
type: nest

‎Documentation/networking/net_cachelines/net_device.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct_dev_ifalias* ifalias
1313
unsigned_long mem_end
1414
unsigned_long mem_start
1515
unsigned_long base_addr
16-
unsigned_long state
16+
unsigned_long state read_mostly read_mostly netif_running(dev)
1717
struct_list_head dev_list
1818
struct_list_head napi_list
1919
struct_list_head unreg_list

‎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 = 8
4-
SUBLEVEL = 1
4+
SUBLEVEL = 2
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

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

Lines changed: 1 addition & 1 deletion
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/nxp/imx/imx6dl-yapp4-common.dtsi‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,9 @@
117117
#address-cells = <1>;
118118
#size-cells = <0>;
119119

120-
phy_port2: phy@1 {
121-
reg = <1>;
122-
};
123-
124-
phy_port3: phy@2 {
125-
reg = <2>;
126-
};
127-
128120
switch@10 {
129121
compatible = "qca,qca8334";
130-
reg = <10>;
122+
reg = <0x10>;
131123
reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
132124

133125
switch_ports: ports {
@@ -149,15 +141,30 @@
149141
eth2: port@2 {
150142
reg = <2>;
151143
label = "eth2";
144+
phy-mode = "internal";
152145
phy-handle = <&phy_port2>;
153146
};
154147

155148
eth1: port@3 {
156149
reg = <3>;
157150
label = "eth1";
151+
phy-mode = "internal";
158152
phy-handle = <&phy_port3>;
159153
};
160154
};
155+
156+
mdio {
157+
#address-cells = <1>;
158+
#size-cells = <0>;
159+
160+
phy_port2: ethernet-phy@1 {
161+
reg = <1>;
162+
};
163+
164+
phy_port3: ethernet-phy@2 {
165+
reg = <2>;
166+
};
167+
};
161168
};
162169
};
163170
};

0 commit comments

Comments
 (0)