Skip to content

Commit 6d36e6f

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.82' into 6.12-main
This is the 6.12.82 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmnjRE4ACgkQONu9yGCS # aT4jLhAAuoEOXYWANUXboSQ2Ubc58WJ/QqVFENGxoOt2qarK3kd9Lr6Vj7QCCxeT # YlanEKBwNVGr+QAslaWKhjOr7ZamEytwcsbTDVNS1mPmpCZuwyJRZU6326GAT8fG # iYoMWLirhbBUYJEeQL2SgKI4Dyra+3xSdO9aY4EWAJxuePfqv7b4WbvYsUeR4OXh # GOZ0neFMqoMT1ZkeZ3XqK8yULmn48+T5xYD2RA6so8dadkzjpXwA+4To4E4AUZu2 # t2hPjRkwJXPz6BhChjg9vYTLuUe6h8CHYqtra+EPY2dsvtRh8zDRwUeUVzHfbDN4 # UwziqoOXVH4J0RLd5fJsn+GlIXaKe9Nu+bDxZAlen2tOs76aywkR6tL3NIC/XB3Q # 7uqGWfITMC3lnqGI64q0g/TUmPGlULqAD/296nXhgUuc3C1HqgghxJay1078h2cJ # f+LoelJap0DIpMsHAt5NkVjij6UODVbA4S1WMXXmfmJwL22WIHwKnDV2DWfUA89F # WMnVCZxXbjWo3PhClj43bX4Y8ugujsiJvY83OHMexy554vwsTqy7UKWR5Ro+mvOO # gHD6hEbDVoG2U+zN1+f4OKZWLoxyIYubD4fO7zUaQgPrr4KNbYUFaevMHnXvRGeK # mlrRi8akCtGCuhwZXTDYMEFtgbwWU0B6rnDT6Td3vfAAYGd75mU= # =zF64 # -----END PGP SIGNATURE----- # gpg: Signature made Sat Apr 18 10:43:58 2026 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents d0827fc + d75ae33 commit 6d36e6f

77 files changed

Lines changed: 739 additions & 357 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.

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

‎arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts‎

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

88
&a53_opp_table {
99
opp-1000000000 {
10-
opp-microvolt = <950000>;
10+
opp-microvolt = <1000000>;
1111
};
1212
};
1313

‎arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi‎

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -845,9 +845,9 @@
845845
regulator-max-microvolt = <1300000>;
846846
regulator-boot-on;
847847
regulator-ramp-delay = <1250>;
848-
rohm,dvs-run-voltage = <880000>;
849-
rohm,dvs-idle-voltage = <820000>;
850-
rohm,dvs-suspend-voltage = <810000>;
848+
rohm,dvs-run-voltage = <900000>;
849+
rohm,dvs-idle-voltage = <850000>;
850+
rohm,dvs-suspend-voltage = <850000>;
851851
regulator-always-on;
852852
};
853853

@@ -857,8 +857,8 @@
857857
regulator-max-microvolt = <1300000>;
858858
regulator-boot-on;
859859
regulator-ramp-delay = <1250>;
860-
rohm,dvs-run-voltage = <950000>;
861-
rohm,dvs-idle-voltage = <850000>;
860+
rohm,dvs-run-voltage = <1000000>;
861+
rohm,dvs-idle-voltage = <900000>;
862862
regulator-always-on;
863863
};
864864

@@ -867,14 +867,14 @@
867867
regulator-min-microvolt = <700000>;
868868
regulator-max-microvolt = <1300000>;
869869
regulator-boot-on;
870-
rohm,dvs-run-voltage = <850000>;
870+
rohm,dvs-run-voltage = <900000>;
871871
};
872872

873873
buck4_reg: BUCK4 {
874874
regulator-name = "buck4";
875875
regulator-min-microvolt = <700000>;
876876
regulator-max-microvolt = <1300000>;
877-
rohm,dvs-run-voltage = <930000>;
877+
rohm,dvs-run-voltage = <1000000>;
878878
};
879879

880880
buck5_reg: BUCK5 {
@@ -1405,13 +1405,3 @@
14051405
fsl,ext-reset-output;
14061406
status = "okay";
14071407
};
1408-
1409-
&a53_opp_table {
1410-
opp-1000000000 {
1411-
opp-microvolt = <850000>;
1412-
};
1413-
1414-
opp-1500000000 {
1415-
opp-microvolt = <950000>;
1416-
};
1417-
};

‎arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
};
180180

181181
&pcie {
182-
reset-gpios = <&gpio4 4 GPIO_ACTIVE_HIGH>;
182+
reset-gpios = <&gpio4 4 GPIO_ACTIVE_LOW>;
183183
vpcie-supply = <&reg_pcie>;
184184
status = "okay";
185185
};

‎arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
#address-cells = <1>;
123123
#size-cells = <1>;
124124
ranges = <0x0 0x0 0xf0000000 0x10000000>;
125+
dma-ranges = <0x0 0x0 0x0 0x40000000>;
125126

126127
crg: clock-reset-controller@8a22000 {
127128
compatible = "hisilicon,hi3798cv200-crg", "syscon", "simple-mfd";

‎arch/arm64/boot/dts/renesas/white-hawk-cpu-common.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,9 @@
239239
clock-frequency = <400000>;
240240

241241
bridge@2c {
242+
pinctrl-0 = <&irq0_pins>;
243+
pinctrl-names = "default";
244+
242245
compatible = "ti,sn65dsi86";
243246
reg = <0x2c>;
244247

@@ -343,6 +346,11 @@
343346
function = "i2c1";
344347
};
345348

349+
irq0_pins: irq0 {
350+
groups = "intc_ex_irq0_a";
351+
function = "intc_ex";
352+
};
353+
346354
keys_pins: keys {
347355
pins = "GP_5_0", "GP_5_1", "GP_5_2";
348356
bias-pull-up;

‎arch/loongarch/include/asm/setup.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,16 @@
77
#define _LOONGARCH_SETUP_H
88

99
#include <linux/types.h>
10+
#include <linux/threads.h>
1011
#include <asm/sections.h>
1112
#include <uapi/asm/setup.h>
1213

1314
#define VECSIZE 0x200
1415

1516
extern unsigned long eentry;
1617
extern unsigned long tlbrentry;
18+
extern unsigned long pcpu_handlers[NR_CPUS];
19+
extern long exception_handlers[VECSIZE * 128 / sizeof(long)];
1720
extern char init_command_line[COMMAND_LINE_SIZE];
1821
extern void tlb_init(int cpu);
1922
extern void cpu_cache_init(void);

‎arch/loongarch/kernel/unwind_orc.c‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -359,11 +359,21 @@ static inline unsigned long bt_address(unsigned long ra)
359359
{
360360
extern unsigned long eentry;
361361

362-
if (__kernel_text_address(ra))
363-
return ra;
362+
#if defined(CONFIG_NUMA) && !defined(CONFIG_PREEMPT_RT)
363+
int cpu;
364+
int vec_sz = sizeof(exception_handlers);
364365

365-
if (__module_text_address(ra))
366-
return ra;
366+
for_each_possible_cpu(cpu) {
367+
if (!pcpu_handlers[cpu])
368+
continue;
369+
370+
if (ra >= pcpu_handlers[cpu] &&
371+
ra < pcpu_handlers[cpu] + vec_sz) {
372+
ra = ra + eentry - pcpu_handlers[cpu];
373+
break;
374+
}
375+
}
376+
#endif
367377

368378
if (ra >= eentry && ra < eentry + EXCCODE_INT_END * VECSIZE) {
369379
unsigned long func;
@@ -382,10 +392,13 @@ static inline unsigned long bt_address(unsigned long ra)
382392
break;
383393
}
384394

385-
return func + offset;
395+
ra = func + offset;
386396
}
387397

388-
return ra;
398+
if (__kernel_text_address(ra))
399+
return ra;
400+
401+
return 0;
389402
}
390403

391404
bool unwind_next_frame(struct unwind_state *state)
@@ -511,9 +524,6 @@ bool unwind_next_frame(struct unwind_state *state)
511524
goto err;
512525
}
513526

514-
if (!__kernel_text_address(state->pc))
515-
goto err;
516-
517527
preempt_enable();
518528
return true;
519529

‎arch/mips/include/asm/cpu-features.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@
484484
# endif
485485
# ifndef cpu_vmbits
486486
# define cpu_vmbits cpu_data[0].vmbits
487-
# define __NEED_VMBITS_PROBE
488487
# endif
489488
#endif
490489

‎arch/mips/include/asm/cpu-info.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,7 @@ struct cpuinfo_mips {
8080
int srsets; /* Shadow register sets */
8181
int package;/* physical package number */
8282
unsigned int globalnumber;
83-
#ifdef CONFIG_64BIT
8483
int vmbits; /* Virtual memory size in bits */
85-
#endif
8684
void *data; /* Additional data */
8785
unsigned int watch_reg_count; /* Number that exist */
8886
unsigned int watch_reg_use_cnt; /* Usable by ptrace */

0 commit comments

Comments
 (0)