Skip to content

Commit 19c22df

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.15.y' into v6.15+
2 parents a168d7b + a2b47f7 commit 19c22df

801 files changed

Lines changed: 9798 additions & 5378 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/regulator/mediatek,mt6357-regulator.yaml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ patternProperties:
3333

3434
"^ldo-v(camio18|aud28|aux18|io18|io28|rf12|rf18|cn18|cn28|fe28)$":
3535
type: object
36-
$ref: fixed-regulator.yaml#
36+
$ref: regulator.yaml#
3737
unevaluatedProperties: false
3838
description:
3939
Properties for single fixed LDO regulator.
@@ -112,7 +112,6 @@ examples:
112112
regulator-enable-ramp-delay = <220>;
113113
};
114114
mt6357_vfe28_reg: ldo-vfe28 {
115-
compatible = "regulator-fixed";
116115
regulator-name = "vfe28";
117116
regulator-min-microvolt = <2800000>;
118117
regulator-max-microvolt = <2800000>;
@@ -125,14 +124,12 @@ examples:
125124
regulator-enable-ramp-delay = <110>;
126125
};
127126
mt6357_vrf18_reg: ldo-vrf18 {
128-
compatible = "regulator-fixed";
129127
regulator-name = "vrf18";
130128
regulator-min-microvolt = <1800000>;
131129
regulator-max-microvolt = <1800000>;
132130
regulator-enable-ramp-delay = <110>;
133131
};
134132
mt6357_vrf12_reg: ldo-vrf12 {
135-
compatible = "regulator-fixed";
136133
regulator-name = "vrf12";
137134
regulator-min-microvolt = <1200000>;
138135
regulator-max-microvolt = <1200000>;
@@ -157,14 +154,12 @@ examples:
157154
regulator-enable-ramp-delay = <264>;
158155
};
159156
mt6357_vcn28_reg: ldo-vcn28 {
160-
compatible = "regulator-fixed";
161157
regulator-name = "vcn28";
162158
regulator-min-microvolt = <2800000>;
163159
regulator-max-microvolt = <2800000>;
164160
regulator-enable-ramp-delay = <264>;
165161
};
166162
mt6357_vcn18_reg: ldo-vcn18 {
167-
compatible = "regulator-fixed";
168163
regulator-name = "vcn18";
169164
regulator-min-microvolt = <1800000>;
170165
regulator-max-microvolt = <1800000>;
@@ -183,7 +178,6 @@ examples:
183178
regulator-enable-ramp-delay = <264>;
184179
};
185180
mt6357_vcamio_reg: ldo-vcamio18 {
186-
compatible = "regulator-fixed";
187181
regulator-name = "vcamio";
188182
regulator-min-microvolt = <1800000>;
189183
regulator-max-microvolt = <1800000>;
@@ -212,28 +206,24 @@ examples:
212206
regulator-always-on;
213207
};
214208
mt6357_vaux18_reg: ldo-vaux18 {
215-
compatible = "regulator-fixed";
216209
regulator-name = "vaux18";
217210
regulator-min-microvolt = <1800000>;
218211
regulator-max-microvolt = <1800000>;
219212
regulator-enable-ramp-delay = <264>;
220213
};
221214
mt6357_vaud28_reg: ldo-vaud28 {
222-
compatible = "regulator-fixed";
223215
regulator-name = "vaud28";
224216
regulator-min-microvolt = <2800000>;
225217
regulator-max-microvolt = <2800000>;
226218
regulator-enable-ramp-delay = <264>;
227219
};
228220
mt6357_vio28_reg: ldo-vio28 {
229-
compatible = "regulator-fixed";
230221
regulator-name = "vio28";
231222
regulator-min-microvolt = <2800000>;
232223
regulator-max-microvolt = <2800000>;
233224
regulator-enable-ramp-delay = <264>;
234225
};
235226
mt6357_vio18_reg: ldo-vio18 {
236-
compatible = "regulator-fixed";
237227
regulator-name = "vio18";
238228
regulator-min-microvolt = <1800000>;
239229
regulator-max-microvolt = <1800000>;

‎Documentation/devicetree/bindings/soc/fsl/fsl,qman-fqd.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ required:
5050
- compatible
5151

5252
allOf:
53-
- $ref: reserved-memory.yaml
53+
- $ref: /schemas/reserved-memory/reserved-memory.yaml
5454

5555
unevaluatedProperties: false
5656

@@ -61,7 +61,7 @@ examples:
6161
#size-cells = <2>;
6262
6363
qman-fqd {
64-
compatible = "shared-dma-pool";
64+
compatible = "fsl,qman-fqd";
6565
size = <0 0x400000>;
6666
alignment = <0 0x400000>;
6767
no-map;

‎Documentation/devicetree/bindings/vendor-prefixes.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,8 @@ patternProperties:
864864
description: Linux-specific binding
865865
"^linx,.*":
866866
description: Linx Technologies
867+
"^liontron,.*":
868+
description: Shenzhen Liontron Technology Co., Ltd
867869
"^liteon,.*":
868870
description: LITE-ON Technology Corp.
869871
"^litex,.*":

‎Documentation/gpu/xe/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ DG2, etc is provided to prototype the driver.
1616
xe_migrate
1717
xe_cs
1818
xe_pm
19+
xe_gt_freq
1920
xe_pcode
2021
xe_gt_mcr
2122
xe_wa

‎Documentation/gpu/xe/xe_gt_freq.rst‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.. SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
3+
==========================
4+
Xe GT Frequency Management
5+
==========================
6+
7+
.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c
8+
:doc: Xe GT Frequency Management
9+
10+
Internal API
11+
============
12+
13+
.. kernel-doc:: drivers/gpu/drm/xe/xe_gt_freq.c
14+
:internal:

‎Documentation/misc-devices/lis3lv02d.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ sporting the feature officially called "HP Mobile Data Protection System 3D" or
2222
models (full list can be found in drivers/platform/x86/hp_accel.c) will have
2323
their axis automatically oriented on standard way (eg: you can directly play
2424
neverball). The accelerometer data is readable via
25-
/sys/devices/platform/lis3lv02d. Reported values are scaled
25+
/sys/devices/faux/lis3lv02d. Reported values are scaled
2626
to mg values (1/1000th of earth gravity).
2727

28-
Sysfs attributes under /sys/devices/platform/lis3lv02d/:
28+
Sysfs attributes under /sys/devices/faux/lis3lv02d/:
2929

3030
position
3131
- 3D position that the accelerometer reports. Format: "(x,y,z)"
@@ -85,7 +85,7 @@ the accelerometer are converted into a "standard" organisation of the axes
8585
If your laptop model is not recognized (cf "dmesg"), you can send an
8686
email to the maintainer to add it to the database. When reporting a new
8787
laptop, please include the output of "dmidecode" plus the value of
88-
/sys/devices/platform/lis3lv02d/position in these four cases.
88+
/sys/devices/faux/lis3lv02d/position in these four cases.
8989

9090
Q&A
9191
---

‎Documentation/netlink/specs/rt_link.yaml‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1778,15 +1778,19 @@ attribute-sets:
17781778
-
17791779
name: iflags
17801780
type: u16
1781+
byte-order: big-endian
17811782
-
17821783
name: oflags
17831784
type: u16
1785+
byte-order: big-endian
17841786
-
17851787
name: ikey
17861788
type: u32
1789+
byte-order: big-endian
17871790
-
17881791
name: okey
17891792
type: u32
1793+
byte-order: big-endian
17901794
-
17911795
name: local
17921796
type: binary
@@ -1806,10 +1810,11 @@ attribute-sets:
18061810
type: u8
18071811
-
18081812
name: encap-limit
1809-
type: u32
1813+
type: u8
18101814
-
18111815
name: flowinfo
18121816
type: u32
1817+
byte-order: big-endian
18131818
-
18141819
name: flags
18151820
type: u32
@@ -1822,9 +1827,11 @@ attribute-sets:
18221827
-
18231828
name: encap-sport
18241829
type: u16
1830+
byte-order: big-endian
18251831
-
18261832
name: encap-dport
18271833
type: u16
1834+
byte-order: big-endian
18281835
-
18291836
name: collect-metadata
18301837
type: flag
@@ -1846,6 +1853,54 @@ attribute-sets:
18461853
-
18471854
name: erspan-hwid
18481855
type: u16
1856+
-
1857+
name: linkinfo-gre6-attrs
1858+
subset-of: linkinfo-gre-attrs
1859+
attributes:
1860+
-
1861+
name: link
1862+
-
1863+
name: iflags
1864+
-
1865+
name: oflags
1866+
-
1867+
name: ikey
1868+
-
1869+
name: okey
1870+
-
1871+
name: local
1872+
display-hint: ipv6
1873+
-
1874+
name: remote
1875+
display-hint: ipv6
1876+
-
1877+
name: ttl
1878+
-
1879+
name: encap-limit
1880+
-
1881+
name: flowinfo
1882+
-
1883+
name: flags
1884+
-
1885+
name: encap-type
1886+
-
1887+
name: encap-flags
1888+
-
1889+
name: encap-sport
1890+
-
1891+
name: encap-dport
1892+
-
1893+
name: collect-metadata
1894+
-
1895+
name: fwmark
1896+
-
1897+
name: erspan-index
1898+
-
1899+
name: erspan-ver
1900+
-
1901+
name: erspan-dir
1902+
-
1903+
name: erspan-hwid
18491904
-
18501905
name: linkinfo-vti-attrs
18511906
name-prefix: ifla-vti-
@@ -1856,9 +1911,11 @@ attribute-sets:
18561911
-
18571912
name: ikey
18581913
type: u32
1914+
byte-order: big-endian
18591915
-
18601916
name: okey
18611917
type: u32
1918+
byte-order: big-endian
18621919
-
18631920
name: local
18641921
type: binary
@@ -1908,6 +1965,7 @@ attribute-sets:
19081965
-
19091966
name: port
19101967
type: u16
1968+
byte-order: big-endian
19111969
-
19121970
name: collect-metadata
19131971
type: flag
@@ -1927,6 +1985,7 @@ attribute-sets:
19271985
-
19281986
name: label
19291987
type: u32
1988+
byte-order: big-endian
19301989
-
19311990
name: ttl-inherit
19321991
type: u8
@@ -1967,9 +2026,11 @@ attribute-sets:
19672026
-
19682027
name: flowinfo
19692028
type: u32
2029+
byte-order: big-endian
19702030
-
19712031
name: flags
19722032
type: u16
2033+
byte-order: big-endian
19732034
-
19742035
name: proto
19752036
type: u8
@@ -1999,9 +2060,11 @@ attribute-sets:
19992060
-
20002061
name: encap-sport
20012062
type: u16
2063+
byte-order: big-endian
20022064
-
20032065
name: encap-dport
20042066
type: u16
2067+
byte-order: big-endian
20052068
-
20062069
name: collect-metadata
20072070
type: flag
@@ -2299,6 +2362,9 @@ sub-messages:
22992362
-
23002363
value: gretap
23012364
attribute-set: linkinfo-gre-attrs
2365+
-
2366+
value: ip6gre
2367+
attribute-set: linkinfo-gre6-attrs
23022368
-
23032369
value: geneve
23042370
attribute-set: linkinfo-geneve-attrs

‎Documentation/networking/xfrm_device.rst‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,13 @@ Callbacks to implement
6565
/* from include/linux/netdevice.h */
6666
struct xfrmdev_ops {
6767
/* Crypto and Packet offload callbacks */
68-
int (*xdo_dev_state_add) (struct xfrm_state *x, struct netlink_ext_ack *extack);
69-
void (*xdo_dev_state_delete) (struct xfrm_state *x);
70-
void (*xdo_dev_state_free) (struct xfrm_state *x);
68+
int (*xdo_dev_state_add)(struct net_device *dev,
69+
struct xfrm_state *x,
70+
struct netlink_ext_ack *extack);
71+
void (*xdo_dev_state_delete)(struct net_device *dev,
72+
struct xfrm_state *x);
73+
void (*xdo_dev_state_free)(struct net_device *dev,
74+
struct xfrm_state *x);
7175
bool (*xdo_dev_offload_ok) (struct sk_buff *skb,
7276
struct xfrm_state *x);
7377
void (*xdo_dev_state_advance_esn) (struct xfrm_state *x);

‎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 = 2
4+
SUBLEVEL = 3
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

‎arch/arm/boot/dts/microchip/at91sam9263ek.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
nand@3 {
153153
reg = <0x3 0x0 0x800000>;
154154
rb-gpios = <&pioA 22 GPIO_ACTIVE_HIGH>;
155-
cs-gpios = <&pioA 15 GPIO_ACTIVE_HIGH>;
155+
cs-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
156156
nand-bus-width = <8>;
157157
nand-ecc-mode = "soft";
158158
nand-on-flash-bbt;

0 commit comments

Comments
 (0)