Skip to content

Commit ee713e4

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.6.y' into rpi-6.6.y
2 parents 3a8b720 + 5697d15 commit ee713e4

File tree

198 files changed

+1758
-1103
lines changed

Some content is hidden

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

198 files changed

+1758
-1103
lines changed

‎Documentation/admin-guide/kdump/vmcoreinfo.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ variables.
172172
Offset of the free_list's member. This value is used to compute the number
173173
of free pages.
174174

175-
Each zone has a free_area structure array called free_area[MAX_ORDER + 1].
175+
Each zone has a free_area structure array called free_area[NR_PAGE_ORDERS].
176176
The free_list represents a linked list of free page blocks.
177177

178178
(list_head, next|prev)
@@ -189,8 +189,8 @@ Offsets of the vmap_area's members. They carry vmalloc-specific
189189
information. Makedumpfile gets the start address of the vmalloc region
190190
from this.
191191

192-
(zone.free_area, MAX_ORDER + 1)
193-
-------------------------------
192+
(zone.free_area, NR_PAGE_ORDERS)
193+
--------------------------------
194194

195195
Free areas descriptor. User-space tools use this value to iterate the
196196
free_area ranges. MAX_ORDER is used by the zone buddy allocator.

‎Documentation/admin-guide/sysctl/net.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@ Will increase power usage.
205205

206206
Default: 0 (off)
207207

208+
mem_pcpu_rsv
209+
------------
210+
211+
Per-cpu reserved forward alloc cache size in page units. Default 1MB per CPU.
212+
208213
rmem_default
209214
------------
210215

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

‎arch/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
#
1010
source "arch/$(SRCARCH)/Kconfig"
1111

12+
config ARCH_CONFIGURES_CPU_MITIGATIONS
13+
bool
14+
15+
if !ARCH_CONFIGURES_CPU_MITIGATIONS
16+
config CPU_MITIGATIONS
17+
def_bool y
18+
endif
19+
1220
menu "General architecture-dependent options"
1321

1422
config ARCH_HAS_SUBPAGE_FAULTS

‎arch/arc/boot/dts/hsdk.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@
205205
};
206206

207207
gmac: ethernet@8000 {
208-
#interrupt-cells = <1>;
209208
compatible = "snps,dwmac";
210209
reg = <0x8000 0x2000>;
211210
interrupts = <10>;

‎arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293

294294
regulator-state-standby {
295295
regulator-on-in-suspend;
296-
regulator-suspend-voltage = <1150000>;
296+
regulator-suspend-microvolt = <1150000>;
297297
regulator-mode = <4>;
298298
};
299299

@@ -314,7 +314,7 @@
314314

315315
regulator-state-standby {
316316
regulator-on-in-suspend;
317-
regulator-suspend-voltage = <1050000>;
317+
regulator-suspend-microvolt = <1050000>;
318318
regulator-mode = <4>;
319319
};
320320

@@ -331,7 +331,7 @@
331331
regulator-always-on;
332332

333333
regulator-state-standby {
334-
regulator-suspend-voltage = <1800000>;
334+
regulator-suspend-microvolt = <1800000>;
335335
regulator-on-in-suspend;
336336
};
337337

@@ -346,7 +346,7 @@
346346
regulator-max-microvolt = <3700000>;
347347

348348
regulator-state-standby {
349-
regulator-suspend-voltage = <1800000>;
349+
regulator-suspend-microvolt = <1800000>;
350350
regulator-on-in-suspend;
351351
};
352352

‎arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@
805805
&pinctrl_usb_pwr>;
806806
dr_mode = "host";
807807
power-active-high;
808+
over-current-active-low;
808809
disable-over-current;
809810
status = "okay";
810811
};

‎arch/arm64/boot/dts/mediatek/mt2712-evb.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
};
130130

131131
&pio {
132-
eth_default: eth_default {
132+
eth_default: eth-default-pins {
133133
tx_pins {
134134
pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GBE_TXD3>,
135135
<MT2712_PIN_72_GBE_TXD2__FUNC_GBE_TXD2>,
@@ -156,7 +156,7 @@
156156
};
157157
};
158158

159-
eth_sleep: eth_sleep {
159+
eth_sleep: eth-sleep-pins {
160160
tx_pins {
161161
pinmux = <MT2712_PIN_71_GBE_TXD3__FUNC_GPIO71>,
162162
<MT2712_PIN_72_GBE_TXD2__FUNC_GPIO72>,
@@ -182,14 +182,14 @@
182182
};
183183
};
184184

185-
usb0_id_pins_float: usb0_iddig {
185+
usb0_id_pins_float: usb0-iddig-pins {
186186
pins_iddig {
187187
pinmux = <MT2712_PIN_12_IDDIG_P0__FUNC_IDDIG_A>;
188188
bias-pull-up;
189189
};
190190
};
191191

192-
usb1_id_pins_float: usb1_iddig {
192+
usb1_id_pins_float: usb1-iddig-pins {
193193
pins_iddig {
194194
pinmux = <MT2712_PIN_14_IDDIG_P1__FUNC_IDDIG_B>;
195195
bias-pull-up;

‎arch/arm64/boot/dts/mediatek/mt2712e.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,10 +249,11 @@
249249
#clock-cells = <1>;
250250
};
251251

252-
infracfg: syscon@10001000 {
252+
infracfg: clock-controller@10001000 {
253253
compatible = "mediatek,mt2712-infracfg", "syscon";
254254
reg = <0 0x10001000 0 0x1000>;
255255
#clock-cells = <1>;
256+
#reset-cells = <1>;
256257
};
257258

258259
pericfg: syscon@10003000 {

‎arch/arm64/boot/dts/mediatek/mt7622.dtsi

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@
252252
clock-names = "hif_sel";
253253
};
254254

255-
cir: cir@10009000 {
255+
cir: ir-receiver@10009000 {
256256
compatible = "mediatek,mt7622-cir";
257257
reg = <0 0x10009000 0 0x1000>;
258258
interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_LOW>;
@@ -283,16 +283,14 @@
283283
};
284284
};
285285

286-
apmixedsys: apmixedsys@10209000 {
287-
compatible = "mediatek,mt7622-apmixedsys",
288-
"syscon";
286+
apmixedsys: clock-controller@10209000 {
287+
compatible = "mediatek,mt7622-apmixedsys";
289288
reg = <0 0x10209000 0 0x1000>;
290289
#clock-cells = <1>;
291290
};
292291

293-
topckgen: topckgen@10210000 {
294-
compatible = "mediatek,mt7622-topckgen",
295-
"syscon";
292+
topckgen: clock-controller@10210000 {
293+
compatible = "mediatek,mt7622-topckgen";
296294
reg = <0 0x10210000 0 0x1000>;
297295
#clock-cells = <1>;
298296
};
@@ -515,7 +513,6 @@
515513
<&pericfg CLK_PERI_AUXADC_PD>;
516514
clock-names = "therm", "auxadc";
517515
resets = <&pericfg MT7622_PERI_THERM_SW_RST>;
518-
reset-names = "therm";
519516
mediatek,auxadc = <&auxadc>;
520517
mediatek,apmixedsys = <&apmixedsys>;
521518
nvmem-cells = <&thermal_calibration>;
@@ -734,9 +731,8 @@
734731
power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;
735732
};
736733

737-
ssusbsys: ssusbsys@1a000000 {
738-
compatible = "mediatek,mt7622-ssusbsys",
739-
"syscon";
734+
ssusbsys: clock-controller@1a000000 {
735+
compatible = "mediatek,mt7622-ssusbsys";
740736
reg = <0 0x1a000000 0 0x1000>;
741737
#clock-cells = <1>;
742738
#reset-cells = <1>;
@@ -793,9 +789,8 @@
793789
};
794790
};
795791

796-
pciesys: pciesys@1a100800 {
797-
compatible = "mediatek,mt7622-pciesys",
798-
"syscon";
792+
pciesys: clock-controller@1a100800 {
793+
compatible = "mediatek,mt7622-pciesys";
799794
reg = <0 0x1a100800 0 0x1000>;
800795
#clock-cells = <1>;
801796
#reset-cells = <1>;
@@ -921,12 +916,13 @@
921916
};
922917
};
923918

924-
hifsys: syscon@1af00000 {
925-
compatible = "mediatek,mt7622-hifsys", "syscon";
919+
hifsys: clock-controller@1af00000 {
920+
compatible = "mediatek,mt7622-hifsys";
926921
reg = <0 0x1af00000 0 0x70>;
922+
#clock-cells = <1>;
927923
};
928924

929-
ethsys: syscon@1b000000 {
925+
ethsys: clock-controller@1b000000 {
930926
compatible = "mediatek,mt7622-ethsys",
931927
"syscon";
932928
reg = <0 0x1b000000 0 0x1000>;
@@ -966,9 +962,7 @@
966962
};
967963

968964
eth: ethernet@1b100000 {
969-
compatible = "mediatek,mt7622-eth",
970-
"mediatek,mt2701-eth",
971-
"syscon";
965+
compatible = "mediatek,mt7622-eth";
972966
reg = <0 0x1b100000 0 0x20000>;
973967
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_LOW>,
974968
<GIC_SPI 224 IRQ_TYPE_LEVEL_LOW>,

0 commit comments

Comments
 (0)