Skip to content

Commit 9e413e5

Browse files
committed
Merge tag 'v6.6.101' into 6.6-main
This is the 6.6.101 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmiMfy4ACgkQONu9yGCS # aT6mtg//YvFOOCFoJ38tw+/DieYVx4NpZqpzqNDnOWVaJHY20uF3lr6S0m7mIltU # zRNxPL5ABqsiibN6dKZrL6Oe4FmJ/YiqEnAl8uK78VW3kpaOPP8N7TGtrfM8mJeh # sr2LNoKfKa6uYzUhVsHDrMJbGic4iBK4Uyr/VN+7+VfHx/4CgwKS0D8VW3vhDN+R # rZfK9GIsqS4Sk4aZex11zX7Yd7fnrNsFWbY+mFutq7Mb6bO/O31uze3SRFISAKgS # TpwQozZsT4hds6aJ97pLp2YKsbe37zRgASGt2WY7+36q4K7e7mgY13mhuL+meIpM # LaVVQe8ktqFcOhvFzljtbW8fQ6HeHr68a4nbHc2FHSwbLnpWeiPI7MEoZEQkPh78 # UD/6OJQAWbj/fYHLU60bLhuxA4QQwkjEY5wxNhukMMb3mKYYB1VAQx6uGLa0pRus # co09jfEPlUqslR8Gf+5CjIPgDoSwU+PYWiSYZEbEGJDsAyUS0P4GwFIf42b37Nc0 # nIx7zbtEFN92xlnzytvE2YqGgS8LT5WRA67B1HJZQdMcnE436J4yCCwxlH1/6ELM # apbncPY3ENsN8XTsaPIxUlI4/yxws+MEiLhxAGsmA9dL/5lfUoFHDcfr6ZKBP2E9 # hAjNMNElh5ubX4ltxRIv7tdz9gqsWqPzbepR3GRYJ96Vx3QBWgg= # =hP8u # -----END PGP SIGNATURE----- # gpg: Signature made Fri Aug 1 10:47:42 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 7d2125f + 3a8abab commit 9e413e5

File tree

86 files changed

+680
-449
lines changed

Some content is hidden

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

86 files changed

+680
-449
lines changed

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 = 6
4-
SUBLEVEL = 100
4+
SUBLEVEL = 101
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

arch/arm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ endif
142142
# Need -Uarm for gcc < 3.x
143143
KBUILD_CPPFLAGS +=$(cpp-y)
144144
KBUILD_CFLAGS +=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm
145-
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float
145+
KBUILD_AFLAGS +=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include $(srctree)/arch/arm/include/asm/unified.h -msoft-float
146146

147147
CHECKFLAGS += -D__arm__
148148

arch/arm64/include/asm/assembler.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
/*
4646
* Save/restore interrupts.
4747
*/
48+
.macro save_and_disable_daif, flags
49+
mrs \flags, daif
50+
msr daifset, #0xf
51+
.endm
52+
4853
.macro save_and_disable_irq, flags
4954
mrs \flags, daif
5055
msr daifset, #3

arch/arm64/kernel/cpufeature.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = {
364364
};
365365

366366
static const struct arm64_ftr_bits ftr_id_aa64mmfr1[] = {
367+
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_ECBHB_SHIFT, 4, 0),
367368
ARM64_FTR_BITS(FTR_HIDDEN, FTR_NONSTRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_TIDCP1_SHIFT, 4, 0),
368369
ARM64_FTR_BITS(FTR_VISIBLE, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_AFP_SHIFT, 4, 0),
369370
ARM64_FTR_BITS(FTR_HIDDEN, FTR_STRICT, FTR_LOWER_SAFE, ID_AA64MMFR1_EL1_HCX_SHIFT, 4, 0),

arch/arm64/kernel/entry.S

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,7 @@ SYM_CODE_END(__bp_harden_el1_vectors)
824824
*
825825
*/
826826
SYM_FUNC_START(cpu_switch_to)
827+
save_and_disable_daif x11
827828
mov x10, #THREAD_CPU_CONTEXT
828829
add x8, x0, x10
829830
mov x9, sp
@@ -847,6 +848,7 @@ SYM_FUNC_START(cpu_switch_to)
847848
ptrauth_keys_install_kernel x1, x8, x9, x10
848849
scs_save x0
849850
scs_load_current
851+
restore_irq x11
850852
ret
851853
SYM_FUNC_END(cpu_switch_to)
852854
NOKPROBE(cpu_switch_to)
@@ -873,6 +875,7 @@ NOKPROBE(ret_from_fork)
873875
* Calls func(regs) using this CPU's irq stack and shadow irq stack.
874876
*/
875877
SYM_FUNC_START(call_on_irq_stack)
878+
save_and_disable_daif x9
876879
#ifdef CONFIG_SHADOW_CALL_STACK
877880
get_current_task x16
878881
scs_save x16
@@ -887,15 +890,18 @@ SYM_FUNC_START(call_on_irq_stack)
887890

888891
/* Move to the new stack and call the function there */
889892
add sp, x16, #IRQ_STACK_SIZE
893+
restore_irq x9
890894
blr x1
891895

896+
save_and_disable_daif x9
892897
/*
893898
* Restore the SP from the FP, and restore the FP and LR from the frame
894899
* record.
895900
*/
896901
mov sp, x29
897902
ldp x29, x30, [sp], #16
898903
scs_load_current
904+
restore_irq x9
899905
ret
900906
SYM_FUNC_END(call_on_irq_stack)
901907
NOKPROBE(call_on_irq_stack)

arch/powerpc/crypto/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ config CRYPTO_CHACHA20_P10
129129
config CRYPTO_POLY1305_P10
130130
tristate "Hash functions: Poly1305 (P10 or later)"
131131
depends on PPC64 && CPU_LITTLE_ENDIAN && VSX
132+
depends on BROKEN # Needs to be fixed to work in softirq context
132133
select CRYPTO_HASH
133134
select CRYPTO_LIB_POLY1305_GENERIC
134135
help

arch/x86/events/intel/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2734,7 +2734,7 @@ static void intel_pmu_read_event(struct perf_event *event)
27342734
if (pmu_enabled)
27352735
intel_pmu_disable_all();
27362736

2737-
if (is_topdown_event(event))
2737+
if (is_topdown_count(event))
27382738
static_call(intel_pmu_update_topdown_event)(event);
27392739
else
27402740
intel_pmu_drain_pebs_buffer();

arch/x86/hyperv/irqdomain.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ static void hv_irq_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
192192
struct pci_dev *dev;
193193
struct hv_interrupt_entry out_entry, *stored_entry;
194194
struct irq_cfg *cfg = irqd_cfg(data);
195-
const cpumask_t *affinity;
196195
int cpu;
197196
u64 status;
198197

@@ -204,8 +203,7 @@ static void hv_irq_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
204203
return;
205204
}
206205

207-
affinity = irq_data_get_effective_affinity_mask(data);
208-
cpu = cpumask_first_and(affinity, cpu_online_mask);
206+
cpu = cpumask_first(irq_data_get_effective_affinity_mask(data));
209207

210208
if (data->chip_data) {
211209
/*

arch/x86/kernel/cpu/amd.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,8 @@ static bool amd_check_tsa_microcode(void)
549549
p.model = c->x86_model;
550550
p.ext_model = c->x86_model >> 4;
551551
p.stepping = c->x86_stepping;
552+
/* reserved bits are expected to be 0 in test below */
553+
p.__reserved = 0;
552554

553555
if (cpu_has(c, X86_FEATURE_ZEN3) ||
554556
cpu_has(c, X86_FEATURE_ZEN4)) {

drivers/base/regmap/regmap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1173,6 +1173,8 @@ struct regmap *__regmap_init(struct device *dev,
11731173
err_map:
11741174
kfree(map);
11751175
err:
1176+
if (bus && bus->free_on_exit)
1177+
kfree(bus);
11761178
return ERR_PTR(ret);
11771179
}
11781180
EXPORT_SYMBOL_GPL(__regmap_init);

0 commit comments

Comments
 (0)