Skip to content

Commit 743ac81

Browse files
frank-wfrank-w
committed
Merge tag 'v6.12.16' into 6.12-main
This is the 6.12.16 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAme4eUsACgkQONu9yGCS # aT5MnQ/+MEOVanhud1c6V27caWDdpjuBVpBpT1eP3UeCEWD9O9DF0AnQA18JxUNR # n9ABP1KHQ28lM5Bs4vZSIoRoikAWG/gXnc4ry4N7eAXlmwaob4Wklqaj8ZDHT2Tq # pWJg6owe8DGraYZtFgZICjJguvvBDmRsU6dT9dGYiXIpSsNrZlLu1BNmsnJ1y1iH # bPY7Qd0Um1l1BzAypWj27AqB8UOMWvRuxj6w4UEq6kxw7MCB1jIvvFVUVglAV4GN # fAnvJX2Xu6kzc7w+9BkBpdAnLcD2Zt1yyEgCO2AocNUl8kLcwKVcm6WW5x8KoLXX # YfhRYbKX3AW3FUiqI25ZC1eUCY0YyO2lXI31IuSszuqyEzK28Q9Gv7qC+yAifgYC # JXrUYnrq1VhtC33y62WuWOhGSPxjbLP2Mxb5REG0M+vcw5pprtNl2oKlOwhqXdVX # GJ3LDbjyZPeMuNkoK/GbGKmdyYWKtfVQd5q0bxxlD7y95Qm8mRqPBUZnMDhcr8j+ # bcmqeGNF1cnQA+5t+O7rwReBB/kqnAOlWyE3c3YfP/ibYZ2h1wzBXBmC7WfsXfxc # tKXBIkqoSSvjeVXtMXI5MsCWYZJvBsW7XIVunKpauBKzxYL3s3/UIVSmha6NeTYm # Up9EFQiiCrR8BWE/5ujdFR2d4MvzVFinpES2h/RpB4tfhilP3Do= # =Q/gV # -----END PGP SIGNATURE----- # gpg: Signature made Fri Feb 21 14:02:03 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 0c441da + 19b4657 commit 743ac81

226 files changed

Lines changed: 2386 additions & 1012 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/devicetree/bindings/regulator/qcom,smd-rpm-regulator.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ description:
2222
Each sub-node is identified using the node's name, with valid values listed
2323
for each of the pmics below.
2424

25-
For mp5496, s1, s2
25+
For mp5496, s1, s2, l2, l5
2626

2727
For pm2250, s1, s2, s3, s4, l1, l2, l3, l4, l5, l6, l7, l8, l9, l10, l11,
2828
l12, l13, l14, l15, l16, l17, l18, l19, l20, l21, l22

‎Documentation/networking/iso15765-2.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ to their default.
369369
370370
addr.can_family = AF_CAN;
371371
addr.can_ifindex = if_nametoindex("can0");
372-
addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373-
addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
372+
addr.can_addr.tp.tx_id = 0x18DA42F1 | CAN_EFF_FLAG;
373+
addr.can_addr.tp.rx_id = 0x18DAF142 | CAN_EFF_FLAG;
374374
375375
ret = bind(s, (struct sockaddr *)&addr, sizeof(addr));
376376
if (ret < 0)

‎Makefile‎

Lines changed: 5 additions & 10 deletions
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 = 15
4+
SUBLEVEL = 16
55
EXTRAVERSION =
66
NAME = Baby Opossum Posse
77

@@ -1057,8 +1057,8 @@ LDFLAGS_vmlinux += --orphan-handling=$(CONFIG_LD_ORPHAN_WARN_LEVEL)
10571057
endif
10581058

10591059
# Align the bit size of userspace programs with the kernel
1060-
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1061-
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CFLAGS))
1060+
KBUILD_USERCFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
1061+
KBUILD_USERLDFLAGS += $(filter -m32 -m64 --target=%, $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS))
10621062

10631063
# make the checker run with the right architecture
10641064
CHECKFLAGS += --arch=$(ARCH)
@@ -1357,18 +1357,13 @@ ifneq ($(wildcard $(resolve_btfids_O)),)
13571357
$(Q)$(MAKE) -sC $(srctree)/tools/bpf/resolve_btfids O=$(resolve_btfids_O) clean
13581358
endif
13591359

1360-
# Clear a bunch of variables before executing the submake
1361-
ifeq ($(quiet),silent_)
1362-
tools_silent=s
1363-
endif
1364-
13651360
tools/: FORCE
13661361
$(Q)mkdir -p $(objtree)/tools
1367-
$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
1362+
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/
13681363

13691364
tools/%: FORCE
13701365
$(Q)mkdir -p $(objtree)/tools
1371-
$(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
1366+
$(Q)$(MAKE) LDFLAGS= O=$(abspath $(objtree)) subdir=tools -C $(srctree)/tools/ $*
13721367

13731368
# ---------------------------------------------------------------------------
13741369
# Kernel selftest

‎arch/alpha/include/uapi/asm/ptrace.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ struct pt_regs {
4242
unsigned long trap_a0;
4343
unsigned long trap_a1;
4444
unsigned long trap_a2;
45+
/* This makes the stack 16-byte aligned as GCC expects */
46+
unsigned long __pad0;
4547
/* These are saved by PAL-code: */
4648
unsigned long ps;
4749
unsigned long pc;

‎arch/alpha/kernel/asm-offsets.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ static void __used foo(void)
1919
DEFINE(TI_STATUS, offsetof(struct thread_info, status));
2020
BLANK();
2121

22+
DEFINE(SP_OFF, offsetof(struct pt_regs, ps));
2223
DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs));
2324
BLANK();
2425

26+
DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack));
27+
BLANK();
28+
2529
DEFINE(HAE_CACHE, offsetof(struct alpha_machine_vector, hae_cache));
2630
DEFINE(HAE_REG, offsetof(struct alpha_machine_vector, hae_register));
2731
}

‎arch/alpha/kernel/entry.S‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
.set noat
1616
.cfi_sections .debug_frame
1717

18-
/* Stack offsets. */
19-
#define SP_OFF 184
20-
#define SWITCH_STACK_SIZE 64
21-
2218
.macro CFI_START_OSF_FRAME func
2319
.align 4
2420
.globl \func
@@ -198,8 +194,8 @@ CFI_END_OSF_FRAME entArith
198194
CFI_START_OSF_FRAME entMM
199195
SAVE_ALL
200196
/* save $9 - $15 so the inline exception code can manipulate them. */
201-
subq $sp, 56, $sp
202-
.cfi_adjust_cfa_offset 56
197+
subq $sp, 64, $sp
198+
.cfi_adjust_cfa_offset 64
203199
stq $9, 0($sp)
204200
stq $10, 8($sp)
205201
stq $11, 16($sp)
@@ -214,7 +210,7 @@ CFI_START_OSF_FRAME entMM
214210
.cfi_rel_offset $13, 32
215211
.cfi_rel_offset $14, 40
216212
.cfi_rel_offset $15, 48
217-
addq $sp, 56, $19
213+
addq $sp, 64, $19
218214
/* handle the fault */
219215
lda $8, 0x3fff
220216
bic $sp, $8, $8
@@ -227,15 +223,15 @@ CFI_START_OSF_FRAME entMM
227223
ldq $13, 32($sp)
228224
ldq $14, 40($sp)
229225
ldq $15, 48($sp)
230-
addq $sp, 56, $sp
226+
addq $sp, 64, $sp
231227
.cfi_restore $9
232228
.cfi_restore $10
233229
.cfi_restore $11
234230
.cfi_restore $12
235231
.cfi_restore $13
236232
.cfi_restore $14
237233
.cfi_restore $15
238-
.cfi_adjust_cfa_offset -56
234+
.cfi_adjust_cfa_offset -64
239235
/* finish up the syscall as normal. */
240236
br ret_from_sys_call
241237
CFI_END_OSF_FRAME entMM
@@ -382,8 +378,8 @@ entUnaUser:
382378
.cfi_restore $0
383379
.cfi_adjust_cfa_offset -256
384380
SAVE_ALL /* setup normal kernel stack */
385-
lda $sp, -56($sp)
386-
.cfi_adjust_cfa_offset 56
381+
lda $sp, -64($sp)
382+
.cfi_adjust_cfa_offset 64
387383
stq $9, 0($sp)
388384
stq $10, 8($sp)
389385
stq $11, 16($sp)
@@ -399,7 +395,7 @@ entUnaUser:
399395
.cfi_rel_offset $14, 40
400396
.cfi_rel_offset $15, 48
401397
lda $8, 0x3fff
402-
addq $sp, 56, $19
398+
addq $sp, 64, $19
403399
bic $sp, $8, $8
404400
jsr $26, do_entUnaUser
405401
ldq $9, 0($sp)
@@ -409,15 +405,15 @@ entUnaUser:
409405
ldq $13, 32($sp)
410406
ldq $14, 40($sp)
411407
ldq $15, 48($sp)
412-
lda $sp, 56($sp)
408+
lda $sp, 64($sp)
413409
.cfi_restore $9
414410
.cfi_restore $10
415411
.cfi_restore $11
416412
.cfi_restore $12
417413
.cfi_restore $13
418414
.cfi_restore $14
419415
.cfi_restore $15
420-
.cfi_adjust_cfa_offset -56
416+
.cfi_adjust_cfa_offset -64
421417
br ret_from_sys_call
422418
CFI_END_OSF_FRAME entUna
423419

‎arch/alpha/kernel/traps.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,7 @@ s_reg_to_mem (unsigned long s_reg)
649649
static int unauser_reg_offsets[32] = {
650650
R(r0), R(r1), R(r2), R(r3), R(r4), R(r5), R(r6), R(r7), R(r8),
651651
/* r9 ... r15 are stored in front of regs. */
652-
-56, -48, -40, -32, -24, -16, -8,
652+
-64, -56, -48, -40, -32, -24, -16, /* padding at -8 */
653653
R(r16), R(r17), R(r18),
654654
R(r19), R(r20), R(r21), R(r22), R(r23), R(r24), R(r25), R(r26),
655655
R(r27), R(r28), R(gp),

‎arch/alpha/mm/fault.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ __load_new_mm_context(struct mm_struct *next_mm)
7878

7979
/* Macro for exception fixup code to access integer registers. */
8080
#define dpf_reg(r) \
81-
(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 : \
82-
(r) <= 18 ? (r)+10 : (r)-10])
81+
(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-17 : \
82+
(r) <= 18 ? (r)+11 : (r)-10])
8383

8484
asmlinkage void
8585
do_page_fault(unsigned long address, unsigned long mmcsr,

‎arch/arm64/Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ KBUILD_CFLAGS += $(CC_FLAGS_NO_FPU) \
4848
KBUILD_CFLAGS += $(call cc-disable-warning, psabi)
4949
KBUILD_AFLAGS += $(compat_vdso)
5050

51+
ifeq ($(call test-ge, $(CONFIG_RUSTC_VERSION), 108500),y)
52+
KBUILD_RUSTFLAGS += --target=aarch64-unknown-none-softfloat
53+
else
5154
KBUILD_RUSTFLAGS += --target=aarch64-unknown-none -Ctarget-feature="-neon"
55+
endif
5256

5357
KBUILD_CFLAGS += $(call cc-option,-mabi=lp64)
5458
KBUILD_AFLAGS += $(call cc-option,-mabi=lp64)

‎arch/arm64/kernel/cacheinfo.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,18 @@ int populate_cache_leaves(unsigned int cpu)
101101
unsigned int level, idx;
102102
enum cache_type type;
103103
struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
104-
struct cacheinfo *this_leaf = this_cpu_ci->info_list;
104+
struct cacheinfo *infos = this_cpu_ci->info_list;
105105

106106
for (idx = 0, level = 1; level <= this_cpu_ci->num_levels &&
107-
idx < this_cpu_ci->num_leaves; idx++, level++) {
107+
idx < this_cpu_ci->num_leaves; level++) {
108108
type = get_cache_type(level);
109109
if (type == CACHE_TYPE_SEPARATE) {
110-
ci_leaf_init(this_leaf++, CACHE_TYPE_DATA, level);
111-
ci_leaf_init(this_leaf++, CACHE_TYPE_INST, level);
110+
if (idx + 1 >= this_cpu_ci->num_leaves)
111+
break;
112+
ci_leaf_init(&infos[idx++], CACHE_TYPE_DATA, level);
113+
ci_leaf_init(&infos[idx++], CACHE_TYPE_INST, level);
112114
} else {
113-
ci_leaf_init(this_leaf++, type, level);
115+
ci_leaf_init(&infos[idx++], type, level);
114116
}
115117
}
116118
return 0;

0 commit comments

Comments
 (0)