Skip to content

Commit 1ec873f

Browse files
popcornmixpopcornmix
committed
Merge remote-tracking branch 'stable/linux-6.12.y' into rpi-6.12.y
2 parents 956776f + e0e2f78 commit 1ec873f

File tree

168 files changed

+1803
-906
lines changed

Some content is hidden

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

168 files changed

+1803
-906
lines changed

‎Documentation/netlink/specs/tc.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,8 @@ attribute-sets:
20172017
attributes:
20182018
-
20192019
name: act
2020-
type: nest
2020+
type: indexed-array
2021+
sub-type: nest
20212022
nested-attributes: tc-act-attrs
20222023
-
20232024
name: police
@@ -2250,7 +2251,8 @@ attribute-sets:
22502251
attributes:
22512252
-
22522253
name: act
2253-
type: nest
2254+
type: indexed-array
2255+
sub-type: nest
22542256
nested-attributes: tc-act-attrs
22552257
-
22562258
name: police
@@ -2745,7 +2747,7 @@ attribute-sets:
27452747
type: u16
27462748
byte-order: big-endian
27472749
-
2748-
name: key-l2-tpv3-sid
2750+
name: key-l2tpv3-sid
27492751
type: u32
27502752
byte-order: big-endian
27512753
-
@@ -3504,7 +3506,7 @@ attribute-sets:
35043506
name: rate64
35053507
type: u64
35063508
-
3507-
name: prate4
3509+
name: prate64
35083510
type: u64
35093511
-
35103512
name: burst

‎MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17535,7 +17535,7 @@ F: include/uapi/linux/ppdev.h
1753517535
PARAVIRT_OPS INTERFACE
1753617536
M: Juergen Gross <[email protected]>
1753717537
R: Ajay Kaher <[email protected]>
17538-
R: Alexey Makhalov <alexey.amakhalov@broadcom.com>
17538+
R: Alexey Makhalov <alexey.makhalov@broadcom.com>
1753917539
R: Broadcom internal kernel review list <[email protected]>
1754017540
L: [email protected]
1754117541
L: [email protected]
@@ -24817,7 +24817,7 @@ F: drivers/misc/vmw_balloon.c
2481724817

2481824818
VMWARE HYPERVISOR INTERFACE
2481924819
M: Ajay Kaher <[email protected]>
24820-
M: Alexey Makhalov <alexey.amakhalov@broadcom.com>
24820+
M: Alexey Makhalov <alexey.makhalov@broadcom.com>
2482124821
R: Broadcom internal kernel review list <[email protected]>
2482224822
L: [email protected]
2482324823
L: [email protected]
@@ -24845,7 +24845,7 @@ F: drivers/scsi/vmw_pvscsi.h
2484524845
VMWARE VIRTUAL PTP CLOCK DRIVER
2484624846
M: Nick Shi <[email protected]>
2484724847
R: Ajay Kaher <[email protected]>
24848-
R: Alexey Makhalov <alexey.amakhalov@broadcom.com>
24848+
R: Alexey Makhalov <alexey.makhalov@broadcom.com>
2484924849
R: Broadcom internal kernel review list <[email protected]>
2485024850
L: [email protected]
2485124851
S: Supported

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

‎arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
status = "okay";
117117
};
118118

119+
&clkc_audio {
120+
status = "okay";
121+
};
122+
119123
&frddr_a {
120124
status = "okay";
121125
};

‎arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
<0x1 0x00000000 0 0xc0000000>;
3636
};
3737

38-
3938
reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
4039
compatible = "regulator-fixed";
4140
regulator-name = "VSD_3V3";
@@ -46,6 +45,16 @@
4645
startup-delay-us = <100>;
4746
off-on-delay-us = <12000>;
4847
};
48+
49+
reg_usdhc2_vqmmc: regulator-usdhc2-vqmmc {
50+
compatible = "regulator-gpio";
51+
regulator-name = "VSD_VSEL";
52+
regulator-min-microvolt = <1800000>;
53+
regulator-max-microvolt = <3300000>;
54+
gpios = <&gpio2 12 GPIO_ACTIVE_HIGH>;
55+
states = <3300000 0x0 1800000 0x1>;
56+
vin-supply = <&ldo5>;
57+
};
4958
};
5059

5160
&A53_0 {
@@ -205,6 +214,7 @@
205214
pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>;
206215
cd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
207216
vmmc-supply = <&reg_usdhc2_vmmc>;
217+
vqmmc-supply = <&reg_usdhc2_vqmmc>;
208218
bus-width = <4>;
209219
status = "okay";
210220
};

‎arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@
222222
compatible = "realtek,rt5616";
223223
reg = <0x1b>;
224224
#sound-dai-cells = <0>;
225+
assigned-clocks = <&cru I2S0_8CH_MCLKOUT>;
226+
assigned-clock-rates = <12288000>;
227+
clocks = <&cru I2S0_8CH_MCLKOUT>;
228+
clock-names = "mclk";
225229
};
226230
};
227231

‎arch/arm64/boot/dts/rockchip/rk3588j.dtsi

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,15 @@
1111
compatible = "operating-points-v2";
1212
opp-shared;
1313

14-
opp-1416000000 {
15-
opp-hz = /bits/ 64 <1416000000>;
14+
opp-1200000000 {
15+
opp-hz = /bits/ 64 <1200000000>;
1616
opp-microvolt = <750000 750000 950000>;
1717
clock-latency-ns = <40000>;
1818
opp-suspend;
1919
};
20-
opp-1608000000 {
21-
opp-hz = /bits/ 64 <1608000000>;
22-
opp-microvolt = <887500 887500 950000>;
23-
clock-latency-ns = <40000>;
24-
};
25-
opp-1704000000 {
26-
opp-hz = /bits/ 64 <1704000000>;
27-
opp-microvolt = <937500 937500 950000>;
20+
opp-1296000000 {
21+
opp-hz = /bits/ 64 <1296000000>;
22+
opp-microvolt = <775000 775000 950000>;
2823
clock-latency-ns = <40000>;
2924
};
3025
};
@@ -33,52 +28,42 @@
3328
compatible = "operating-points-v2";
3429
opp-shared;
3530

31+
opp-1200000000{
32+
opp-hz = /bits/ 64 <1200000000>;
33+
opp-microvolt = <750000 750000 950000>;
34+
clock-latency-ns = <40000>;
35+
};
3636
opp-1416000000 {
3737
opp-hz = /bits/ 64 <1416000000>;
38-
opp-microvolt = <750000 750000 950000>;
38+
opp-microvolt = <762500 762500 950000>;
3939
clock-latency-ns = <40000>;
4040
};
4141
opp-1608000000 {
4242
opp-hz = /bits/ 64 <1608000000>;
4343
opp-microvolt = <787500 787500 950000>;
4444
clock-latency-ns = <40000>;
4545
};
46-
opp-1800000000 {
47-
opp-hz = /bits/ 64 <1800000000>;
48-
opp-microvolt = <875000 875000 950000>;
49-
clock-latency-ns = <40000>;
50-
};
51-
opp-2016000000 {
52-
opp-hz = /bits/ 64 <2016000000>;
53-
opp-microvolt = <950000 950000 950000>;
54-
clock-latency-ns = <40000>;
55-
};
5646
};
5747

5848
cluster2_opp_table: opp-table-cluster2 {
5949
compatible = "operating-points-v2";
6050
opp-shared;
6151

52+
opp-1200000000{
53+
opp-hz = /bits/ 64 <1200000000>;
54+
opp-microvolt = <750000 750000 950000>;
55+
clock-latency-ns = <40000>;
56+
};
6257
opp-1416000000 {
6358
opp-hz = /bits/ 64 <1416000000>;
64-
opp-microvolt = <750000 750000 950000>;
59+
opp-microvolt = <762500 762500 950000>;
6560
clock-latency-ns = <40000>;
6661
};
6762
opp-1608000000 {
6863
opp-hz = /bits/ 64 <1608000000>;
6964
opp-microvolt = <787500 787500 950000>;
7065
clock-latency-ns = <40000>;
7166
};
72-
opp-1800000000 {
73-
opp-hz = /bits/ 64 <1800000000>;
74-
opp-microvolt = <875000 875000 950000>;
75-
clock-latency-ns = <40000>;
76-
};
77-
opp-2016000000 {
78-
opp-hz = /bits/ 64 <2016000000>;
79-
opp-microvolt = <950000 950000 950000>;
80-
clock-latency-ns = <40000>;
81-
};
8267
};
8368

8469
gpu_opp_table: opp-table {
@@ -104,10 +89,6 @@
10489
opp-hz = /bits/ 64 <700000000>;
10590
opp-microvolt = <750000 750000 850000>;
10691
};
107-
opp-850000000 {
108-
opp-hz = /bits/ 64 <800000000>;
109-
opp-microvolt = <787500 787500 850000>;
110-
};
11192
};
11293
};
11394

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long v
5555

5656
/* Query offset/name of register from its name/offset */
5757
extern int regs_query_register_offset(const char *name);
58-
#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last))
58+
#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last) - sizeof(unsigned long))
5959

6060
/**
6161
* regs_get_register() - get register value from its offset

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ typedef u32 uprobe_opcode_t;
1515
#define UPROBE_XOLBP_INSN __emit_break(BRK_UPROBE_XOLBP)
1616

1717
struct arch_uprobe {
18-
unsigned long resume_era;
1918
u32 insn[2];
2019
u32 ixol[2];
2120
bool simulate;

‎arch/loongarch/kernel/genex.S

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <asm/stackframe.h>
1717
#include <asm/thread_info.h>
1818

19+
.section .cpuidle.text, "ax"
1920
.align 5
2021
SYM_FUNC_START(__arch_cpu_idle)
2122
/* start of idle interrupt region */
@@ -31,14 +32,16 @@ SYM_FUNC_START(__arch_cpu_idle)
3132
*/
3233
idle 0
3334
/* end of idle interrupt region */
34-
1: jr ra
35+
idle_exit:
36+
jr ra
3537
SYM_FUNC_END(__arch_cpu_idle)
38+
.previous
3639

3740
SYM_CODE_START(handle_vint)
3841
UNWIND_HINT_UNDEFINED
3942
BACKUP_T0T1
4043
SAVE_ALL
41-
la_abs t1, 1b
44+
la_abs t1, idle_exit
4245
LONG_L t0, sp, PT_ERA
4346
/* 3 instructions idle interrupt region */
4447
ori t0, t0, 0b1100

0 commit comments

Comments
 (0)