Skip to content

Commit adcf195

Browse files
xdevs23xdevs23
committed
Merge remote-tracking branch 'stable/linux-6.5.y' into v6.5+
2 parents 8087a1f + 2ba0bab commit adcf195

315 files changed

Lines changed: 3884 additions & 2307 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/admin-guide/cgroup-v1/memory.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ Brief summary of control files.
9292
memory.oom_control set/show oom controls.
9393
memory.numa_stat show the number of memory usage per numa
9494
node
95-
memory.kmem.limit_in_bytes This knob is deprecated and writing to
96-
it will return -ENOTSUPP.
9795
memory.kmem.usage_in_bytes show current kernel memory allocation
9896
memory.kmem.failcnt show the number of kernel memory usage
9997
hits limits

‎Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ description: |
1414
reads required input clock frequencies from the devicetree and acts as clock
1515
provider for all clock consumers of PS clocks.
1616
17-
select: false
18-
1917
properties:
2018
compatible:
2119
const: xlnx,versal-clk

‎Makefile‎

Lines changed: 3 additions & 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 = 5
4-
SUBLEVEL = 3
4+
SUBLEVEL = 4
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

@@ -1960,7 +1960,9 @@ quiet_cmd_depmod = DEPMOD $(MODLIB)
19601960

19611961
modules_install:
19621962
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst
1963+
ifndef modules_sign_only
19631964
$(call cmd,depmod)
1965+
endif
19641966

19651967
else # CONFIG_MODULES
19661968

‎arch/arc/include/asm/atomic-llsc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ static inline void arch_atomic_##op(int i, atomic_t *v) \
1818
: [val] "=&r" (val) /* Early clobber to prevent reg reuse */ \
1919
: [ctr] "r" (&v->counter), /* Not "m": llock only supports reg direct addr mode */ \
2020
[i] "ir" (i) \
21-
: "cc"); \
21+
: "cc", "memory"); \
2222
} \
2323

2424
#define ATOMIC_OP_RETURN(op, asm_op) \
@@ -34,7 +34,7 @@ static inline int arch_atomic_##op##_return_relaxed(int i, atomic_t *v) \
3434
: [val] "=&r" (val) \
3535
: [ctr] "r" (&v->counter), \
3636
[i] "ir" (i) \
37-
: "cc"); \
37+
: "cc", "memory"); \
3838
\
3939
return val; \
4040
}
@@ -56,7 +56,7 @@ static inline int arch_atomic_fetch_##op##_relaxed(int i, atomic_t *v) \
5656
[orig] "=&r" (orig) \
5757
: [ctr] "r" (&v->counter), \
5858
[i] "ir" (i) \
59-
: "cc"); \
59+
: "cc", "memory"); \
6060
\
6161
return orig; \
6262
}

‎arch/arc/include/asm/atomic64-arcv2.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static inline void arch_atomic64_##op(s64 a, atomic64_t *v) \
6060
" bnz 1b \n" \
6161
: "=&r"(val) \
6262
: "r"(&v->counter), "ir"(a) \
63-
: "cc"); \
63+
: "cc", "memory"); \
6464
} \
6565

6666
#define ATOMIC64_OP_RETURN(op, op1, op2) \
@@ -77,7 +77,7 @@ static inline s64 arch_atomic64_##op##_return_relaxed(s64 a, atomic64_t *v) \
7777
" bnz 1b \n" \
7878
: [val] "=&r"(val) \
7979
: "r"(&v->counter), "ir"(a) \
80-
: "cc"); /* memory clobber comes from smp_mb() */ \
80+
: "cc", "memory"); \
8181
\
8282
return val; \
8383
}
@@ -99,7 +99,7 @@ static inline s64 arch_atomic64_fetch_##op##_relaxed(s64 a, atomic64_t *v) \
9999
" bnz 1b \n" \
100100
: "=&r"(orig), "=&r"(val) \
101101
: "r"(&v->counter), "ir"(a) \
102-
: "cc"); /* memory clobber comes from smp_mb() */ \
102+
: "cc", "memory"); \
103103
\
104104
return orig; \
105105
}

‎arch/arm/boot/dts/broadcom/bcm4708-linksys-ea6500-v2.dts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919

2020
memory@0 {
2121
device_type = "memory";
22-
reg = <0x00000000 0x08000000>;
22+
reg = <0x00000000 0x08000000>,
23+
<0x88000000 0x08000000>;
2324
};
2425

2526
gpio-keys {

‎arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-castor.dts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@
125125

126126
syna,startup-delay-ms = <100>;
127127

128-
rmi-f01@1 {
128+
rmi4-f01@1 {
129129
reg = <0x1>;
130-
syna,nosleep = <1>;
130+
syna,nosleep-mode = <1>;
131131
};
132132

133-
rmi-f11@11 {
133+
rmi4-f11@11 {
134134
reg = <0x11>;
135-
syna,f11-flip-x = <1>;
136135
syna,sensor-type = <1>;
136+
touchscreen-inverted-x;
137137
};
138138
};
139139
};

‎arch/arm/boot/dts/samsung/exynos4210-i9100.dts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@
207207
power-on-delay = <10>;
208208
reset-delay = <10>;
209209

210-
panel-width-mm = <90>;
211-
panel-height-mm = <154>;
210+
panel-width-mm = <56>;
211+
panel-height-mm = <93>;
212212

213213
display-timings {
214214
timing {

‎arch/arm64/boot/dts/nvidia/tegra186.dtsi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@
135135
clocks = <&bpmp TEGRA186_CLK_AHUB>;
136136
clock-names = "ahub";
137137
assigned-clocks = <&bpmp TEGRA186_CLK_AHUB>;
138-
assigned-clock-parents = <&bpmp TEGRA186_CLK_PLL_A_OUT0>;
138+
assigned-clock-parents = <&bpmp TEGRA186_CLK_PLLP_OUT0>;
139+
assigned-clock-rates = <81600000>;
139140
#address-cells = <1>;
140141
#size-cells = <1>;
141142
ranges = <0x02900800 0x02900800 0x11800>;

‎arch/arm64/boot/dts/nvidia/tegra194.dtsi‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@
231231
clocks = <&bpmp TEGRA194_CLK_AHUB>;
232232
clock-names = "ahub";
233233
assigned-clocks = <&bpmp TEGRA194_CLK_AHUB>;
234-
assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLA_OUT0>;
234+
assigned-clock-parents = <&bpmp TEGRA194_CLK_PLLP_OUT0>;
235+
assigned-clock-rates = <81600000>;
235236
status = "disabled";
236237

237238
#address-cells = <2>;

0 commit comments

Comments
 (0)