Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit ed7d8fc

Browse files
xanmodxanmod
committed
Merge tag 'v6.10.4' into 6.10
This is the 6.10.4 stable release
2 parents a89cde1 + 33420ab commit ed7d8fc

File tree

143 files changed

+2028
-1273
lines changed

Some content is hidden

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

143 files changed

+2028
-1273
lines changed

‎Documentation/admin-guide/mm/transhuge.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,11 @@ PMD-mappable transparent hugepage::
202202

203203
cat /sys/kernel/mm/transparent_hugepage/hpage_pmd_size
204204

205-
khugepaged will be automatically started when one or more hugepage
206-
sizes are enabled (either by directly setting "always" or "madvise",
207-
or by setting "inherit" while the top-level enabled is set to "always"
208-
or "madvise"), and it'll be automatically shutdown when the last
209-
hugepage size is disabled (either by directly setting "never", or by
210-
setting "inherit" while the top-level enabled is set to "never").
205+
khugepaged will be automatically started when PMD-sized THP is enabled
206+
(either of the per-size anon control or the top-level control are set
207+
to "always" or "madvise"), and it'll be automatically shutdown when
208+
PMD-sized THP is disabled (when both the per-size anon control and the
209+
top-level control are "never")
211210

212211
Khugepaged controls
213212
-------------------

‎Documentation/netlink/specs/ethtool.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,6 +1634,7 @@ operations:
16341634
request:
16351635
attributes:
16361636
- header
1637+
- context
16371638
reply:
16381639
attributes:
16391640
- header
@@ -1642,7 +1643,6 @@ operations:
16421643
- indir
16431644
- hkey
16441645
- input_xfrm
1645-
dump: *rss-get-op
16461646
-
16471647
name: plca-get-cfg
16481648
doc: Get PLCA params.

‎Documentation/networking/ethtool-netlink.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,6 +1800,7 @@ Kernel response contents:
18001800

18011801
===================================== ====== ==========================
18021802
``ETHTOOL_A_RSS_HEADER`` nested reply header
1803+
``ETHTOOL_A_RSS_CONTEXT`` u32 context number
18031804
``ETHTOOL_A_RSS_HFUNC`` u32 RSS hash func
18041805
``ETHTOOL_A_RSS_INDIR`` binary Indir table bytes
18051806
``ETHTOOL_A_RSS_HKEY`` binary Hash key bytes

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

‎arch/arm/kernel/perf_callchain.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ static bool
8585
callchain_trace(void *data, unsigned long pc)
8686
{
8787
struct perf_callchain_entry_ctx *entry = data;
88-
perf_callchain_store(entry, pc);
89-
return true;
88+
return perf_callchain_store(entry, pc) == 0;
9089
}
9190

9291
void

‎arch/arm/mm/proc.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void cpu_arm7tdmi_proc_init(void);
1717
__ADDRESSABLE(cpu_arm7tdmi_proc_init);
1818
void cpu_arm7tdmi_proc_fin(void);
1919
__ADDRESSABLE(cpu_arm7tdmi_proc_fin);
20-
void cpu_arm7tdmi_reset(void);
20+
void cpu_arm7tdmi_reset(unsigned long addr, bool hvc);
2121
__ADDRESSABLE(cpu_arm7tdmi_reset);
2222
int cpu_arm7tdmi_do_idle(void);
2323
__ADDRESSABLE(cpu_arm7tdmi_do_idle);
@@ -32,7 +32,7 @@ void cpu_arm720_proc_init(void);
3232
__ADDRESSABLE(cpu_arm720_proc_init);
3333
void cpu_arm720_proc_fin(void);
3434
__ADDRESSABLE(cpu_arm720_proc_fin);
35-
void cpu_arm720_reset(void);
35+
void cpu_arm720_reset(unsigned long addr, bool hvc);
3636
__ADDRESSABLE(cpu_arm720_reset);
3737
int cpu_arm720_do_idle(void);
3838
__ADDRESSABLE(cpu_arm720_do_idle);
@@ -49,7 +49,7 @@ void cpu_arm740_proc_init(void);
4949
__ADDRESSABLE(cpu_arm740_proc_init);
5050
void cpu_arm740_proc_fin(void);
5151
__ADDRESSABLE(cpu_arm740_proc_fin);
52-
void cpu_arm740_reset(void);
52+
void cpu_arm740_reset(unsigned long addr, bool hvc);
5353
__ADDRESSABLE(cpu_arm740_reset);
5454
int cpu_arm740_do_idle(void);
5555
__ADDRESSABLE(cpu_arm740_do_idle);
@@ -64,7 +64,7 @@ void cpu_arm9tdmi_proc_init(void);
6464
__ADDRESSABLE(cpu_arm9tdmi_proc_init);
6565
void cpu_arm9tdmi_proc_fin(void);
6666
__ADDRESSABLE(cpu_arm9tdmi_proc_fin);
67-
void cpu_arm9tdmi_reset(void);
67+
void cpu_arm9tdmi_reset(unsigned long addr, bool hvc);
6868
__ADDRESSABLE(cpu_arm9tdmi_reset);
6969
int cpu_arm9tdmi_do_idle(void);
7070
__ADDRESSABLE(cpu_arm9tdmi_do_idle);
@@ -79,7 +79,7 @@ void cpu_arm920_proc_init(void);
7979
__ADDRESSABLE(cpu_arm920_proc_init);
8080
void cpu_arm920_proc_fin(void);
8181
__ADDRESSABLE(cpu_arm920_proc_fin);
82-
void cpu_arm920_reset(void);
82+
void cpu_arm920_reset(unsigned long addr, bool hvc);
8383
__ADDRESSABLE(cpu_arm920_reset);
8484
int cpu_arm920_do_idle(void);
8585
__ADDRESSABLE(cpu_arm920_do_idle);
@@ -102,7 +102,7 @@ void cpu_arm922_proc_init(void);
102102
__ADDRESSABLE(cpu_arm922_proc_init);
103103
void cpu_arm922_proc_fin(void);
104104
__ADDRESSABLE(cpu_arm922_proc_fin);
105-
void cpu_arm922_reset(void);
105+
void cpu_arm922_reset(unsigned long addr, bool hvc);
106106
__ADDRESSABLE(cpu_arm922_reset);
107107
int cpu_arm922_do_idle(void);
108108
__ADDRESSABLE(cpu_arm922_do_idle);
@@ -119,7 +119,7 @@ void cpu_arm925_proc_init(void);
119119
__ADDRESSABLE(cpu_arm925_proc_init);
120120
void cpu_arm925_proc_fin(void);
121121
__ADDRESSABLE(cpu_arm925_proc_fin);
122-
void cpu_arm925_reset(void);
122+
void cpu_arm925_reset(unsigned long addr, bool hvc);
123123
__ADDRESSABLE(cpu_arm925_reset);
124124
int cpu_arm925_do_idle(void);
125125
__ADDRESSABLE(cpu_arm925_do_idle);
@@ -159,7 +159,7 @@ void cpu_arm940_proc_init(void);
159159
__ADDRESSABLE(cpu_arm940_proc_init);
160160
void cpu_arm940_proc_fin(void);
161161
__ADDRESSABLE(cpu_arm940_proc_fin);
162-
void cpu_arm940_reset(void);
162+
void cpu_arm940_reset(unsigned long addr, bool hvc);
163163
__ADDRESSABLE(cpu_arm940_reset);
164164
int cpu_arm940_do_idle(void);
165165
__ADDRESSABLE(cpu_arm940_do_idle);
@@ -174,7 +174,7 @@ void cpu_arm946_proc_init(void);
174174
__ADDRESSABLE(cpu_arm946_proc_init);
175175
void cpu_arm946_proc_fin(void);
176176
__ADDRESSABLE(cpu_arm946_proc_fin);
177-
void cpu_arm946_reset(void);
177+
void cpu_arm946_reset(unsigned long addr, bool hvc);
178178
__ADDRESSABLE(cpu_arm946_reset);
179179
int cpu_arm946_do_idle(void);
180180
__ADDRESSABLE(cpu_arm946_do_idle);
@@ -429,7 +429,7 @@ void cpu_v7_proc_init(void);
429429
__ADDRESSABLE(cpu_v7_proc_init);
430430
void cpu_v7_proc_fin(void);
431431
__ADDRESSABLE(cpu_v7_proc_fin);
432-
void cpu_v7_reset(void);
432+
void cpu_v7_reset(unsigned long addr, bool hvc);
433433
__ADDRESSABLE(cpu_v7_reset);
434434
int cpu_v7_do_idle(void);
435435
__ADDRESSABLE(cpu_v7_do_idle);

‎arch/arm64/include/asm/jump_label.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/types.h>
1414
#include <asm/insn.h>
1515

16+
#define HAVE_JUMP_LABEL_BATCH
1617
#define JUMP_LABEL_NOP_SIZE AARCH64_INSN_SIZE
1718

1819
#define JUMP_TABLE_ENTRY(key, label) \

‎arch/arm64/kernel/jump_label.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
*/
88
#include <linux/kernel.h>
99
#include <linux/jump_label.h>
10+
#include <linux/smp.h>
1011
#include <asm/insn.h>
1112
#include <asm/patching.h>
1213

13-
void arch_jump_label_transform(struct jump_entry *entry,
14-
enum jump_label_type type)
14+
bool arch_jump_label_transform_queue(struct jump_entry *entry,
15+
enum jump_label_type type)
1516
{
1617
void *addr = (void *)jump_entry_code(entry);
1718
u32 insn;
@@ -25,4 +26,10 @@ void arch_jump_label_transform(struct jump_entry *entry,
2526
}
2627

2728
aarch64_insn_patch_text_nosync(addr, insn);
29+
return true;
30+
}
31+
32+
void arch_jump_label_transform_apply(void)
33+
{
34+
kick_all_cpus_sync();
2835
}

‎arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi

Lines changed: 52 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,16 @@
9999
rtc0: rtc@1fe07800 {
100100
compatible = "loongson,ls2k1000-rtc";
101101
reg = <0 0x1fe07800 0 0x78>;
102-
interrupt-parent = <&liointc0>;
103-
interrupts = <60 IRQ_TYPE_LEVEL_LOW>;
102+
interrupt-parent = <&liointc1>;
103+
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
104104
};
105105

106106
uart0: serial@1fe00000 {
107107
compatible = "ns16550a";
108108
reg = <0 0x1fe00000 0 0x8>;
109109
clock-frequency = <125000000>;
110110
interrupt-parent = <&liointc0>;
111-
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
111+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
112112
no-loopback-test;
113113
};
114114

@@ -117,7 +117,6 @@
117117
device_type = "pci";
118118
#address-cells = <3>;
119119
#size-cells = <2>;
120-
#interrupt-cells = <2>;
121120

122121
reg = <0 0x1a000000 0 0x02000000>,
123122
<0xfe 0x00000000 0 0x20000000>;
@@ -132,8 +131,8 @@
132131
"pciclass0c03";
133132

134133
reg = <0x1800 0x0 0x0 0x0 0x0>;
135-
interrupts = <12 IRQ_TYPE_LEVEL_LOW>,
136-
<13 IRQ_TYPE_LEVEL_LOW>;
134+
interrupts = <12 IRQ_TYPE_LEVEL_HIGH>,
135+
<13 IRQ_TYPE_LEVEL_HIGH>;
137136
interrupt-names = "macirq", "eth_lpi";
138137
interrupt-parent = <&liointc0>;
139138
phy-mode = "rgmii-id";
@@ -156,8 +155,8 @@
156155
"loongson, pci-gmac";
157156

158157
reg = <0x1900 0x0 0x0 0x0 0x0>;
159-
interrupts = <14 IRQ_TYPE_LEVEL_LOW>,
160-
<15 IRQ_TYPE_LEVEL_LOW>;
158+
interrupts = <14 IRQ_TYPE_LEVEL_HIGH>,
159+
<15 IRQ_TYPE_LEVEL_HIGH>;
161160
interrupt-names = "macirq", "eth_lpi";
162161
interrupt-parent = <&liointc0>;
163162
phy-mode = "rgmii-id";
@@ -179,7 +178,7 @@
179178
"pciclass0c03";
180179

181180
reg = <0x2100 0x0 0x0 0x0 0x0>;
182-
interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
181+
interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
183182
interrupt-parent = <&liointc1>;
184183
};
185184

@@ -190,7 +189,7 @@
190189
"pciclass0c03";
191190

192191
reg = <0x2200 0x0 0x0 0x0 0x0>;
193-
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
192+
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
194193
interrupt-parent = <&liointc1>;
195194
};
196195

@@ -201,97 +200,121 @@
201200
"pciclass0106";
202201

203202
reg = <0x4000 0x0 0x0 0x0 0x0>;
204-
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
203+
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>;
205204
interrupt-parent = <&liointc0>;
206205
};
207206

208-
pci_bridge@9,0 {
207+
pcie@9,0 {
209208
compatible = "pci0014,7a19.0",
210209
"pci0014,7a19",
211210
"pciclass060400",
212211
"pciclass0604";
213212

214213
reg = <0x4800 0x0 0x0 0x0 0x0>;
214+
#address-cells = <3>;
215+
#size-cells = <2>;
216+
device_type = "pci";
215217
#interrupt-cells = <1>;
216-
interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
218+
interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
217219
interrupt-parent = <&liointc1>;
218220
interrupt-map-mask = <0 0 0 0>;
219-
interrupt-map = <0 0 0 0 &liointc1 0 IRQ_TYPE_LEVEL_LOW>;
221+
interrupt-map = <0 0 0 0 &liointc1 0 IRQ_TYPE_LEVEL_HIGH>;
222+
ranges;
220223
external-facing;
221224
};
222225

223-
pci_bridge@a,0 {
226+
pcie@a,0 {
224227
compatible = "pci0014,7a09.0",
225228
"pci0014,7a09",
226229
"pciclass060400",
227230
"pciclass0604";
228231

229232
reg = <0x5000 0x0 0x0 0x0 0x0>;
233+
#address-cells = <3>;
234+
#size-cells = <2>;
235+
device_type = "pci";
230236
#interrupt-cells = <1>;
231-
interrupts = <1 IRQ_TYPE_LEVEL_LOW>;
237+
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
232238
interrupt-parent = <&liointc1>;
233239
interrupt-map-mask = <0 0 0 0>;
234-
interrupt-map = <0 0 0 0 &liointc1 1 IRQ_TYPE_LEVEL_LOW>;
240+
interrupt-map = <0 0 0 0 &liointc1 1 IRQ_TYPE_LEVEL_HIGH>;
241+
ranges;
235242
external-facing;
236243
};
237244

238-
pci_bridge@b,0 {
245+
pcie@b,0 {
239246
compatible = "pci0014,7a09.0",
240247
"pci0014,7a09",
241248
"pciclass060400",
242249
"pciclass0604";
243250

244251
reg = <0x5800 0x0 0x0 0x0 0x0>;
252+
#address-cells = <3>;
253+
#size-cells = <2>;
254+
device_type = "pci";
245255
#interrupt-cells = <1>;
246-
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
256+
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
247257
interrupt-parent = <&liointc1>;
248258
interrupt-map-mask = <0 0 0 0>;
249-
interrupt-map = <0 0 0 0 &liointc1 2 IRQ_TYPE_LEVEL_LOW>;
259+
interrupt-map = <0 0 0 0 &liointc1 2 IRQ_TYPE_LEVEL_HIGH>;
260+
ranges;
250261
external-facing;
251262
};
252263

253-
pci_bridge@c,0 {
264+
pcie@c,0 {
254265
compatible = "pci0014,7a09.0",
255266
"pci0014,7a09",
256267
"pciclass060400",
257268
"pciclass0604";
258269

259270
reg = <0x6000 0x0 0x0 0x0 0x0>;
271+
#address-cells = <3>;
272+
#size-cells = <2>;
273+
device_type = "pci";
260274
#interrupt-cells = <1>;
261-
interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
275+
interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;
262276
interrupt-parent = <&liointc1>;
263277
interrupt-map-mask = <0 0 0 0>;
264-
interrupt-map = <0 0 0 0 &liointc1 3 IRQ_TYPE_LEVEL_LOW>;
278+
interrupt-map = <0 0 0 0 &liointc1 3 IRQ_TYPE_LEVEL_HIGH>;
279+
ranges;
265280
external-facing;
266281
};
267282

268-
pci_bridge@d,0 {
283+
pcie@d,0 {
269284
compatible = "pci0014,7a19.0",
270285
"pci0014,7a19",
271286
"pciclass060400",
272287
"pciclass0604";
273288

274289
reg = <0x6800 0x0 0x0 0x0 0x0>;
290+
#address-cells = <3>;
291+
#size-cells = <2>;
292+
device_type = "pci";
275293
#interrupt-cells = <1>;
276-
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
294+
interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;
277295
interrupt-parent = <&liointc1>;
278296
interrupt-map-mask = <0 0 0 0>;
279-
interrupt-map = <0 0 0 0 &liointc1 4 IRQ_TYPE_LEVEL_LOW>;
297+
interrupt-map = <0 0 0 0 &liointc1 4 IRQ_TYPE_LEVEL_HIGH>;
298+
ranges;
280299
external-facing;
281300
};
282301

283-
pci_bridge@e,0 {
302+
pcie@e,0 {
284303
compatible = "pci0014,7a09.0",
285304
"pci0014,7a09",
286305
"pciclass060400",
287306
"pciclass0604";
288307

289308
reg = <0x7000 0x0 0x0 0x0 0x0>;
309+
#address-cells = <3>;
310+
#size-cells = <2>;
311+
device_type = "pci";
290312
#interrupt-cells = <1>;
291-
interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
313+
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
292314
interrupt-parent = <&liointc1>;
293315
interrupt-map-mask = <0 0 0 0>;
294-
interrupt-map = <0 0 0 0 &liointc1 5 IRQ_TYPE_LEVEL_LOW>;
316+
interrupt-map = <0 0 0 0 &liointc1 5 IRQ_TYPE_LEVEL_HIGH>;
317+
ranges;
295318
external-facing;
296319
};
297320

0 commit comments

Comments
 (0)