Skip to content

Commit 14633f5

Browse files
frank-wfrank-w
committed
Merge tag 'v6.1.150' into 6.1-main
This is the 6.1.150 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmi5k4sACgkQONu9yGCS # aT6ebw//bh/P1Tnfvv6JKacOZb2WHzaAV/fr/6fZjmM5LEyRGZsMqmkolv0XXRiw # 87R/TgAm51l68B7IemrV7IoJYvQtmSMK8svIPktbDx9h2K5WX7tOH+tNK2x036hc # hPCVlZkAi447M/gu+pLAxFogj2KdCayVKfS8qDJBDC/nQLsSoEgoz2ONCgql784W # xUEKjNbi3i0hItGM1DnxRJBVhTqYaGE/TZb05t5r3kpeAq6iS/58Rk3h2nBrSDMV # 2vehA59gOO0ZaF5+t/NtCWWmzIS3aWzpVcSnAKARKVKogIbimD/NsdFVKeEoFenb # x3vwq4HH0ZbCZwXHrN94VoW7l/7t2iBNQAaPakhPqUCNmgsF7ZCOtUoaoVgeNSvx # 3urtCIsy3NOHHr8NgSwQscjDzJnIVxxcvFqrnoQ2V9GDRyvw5ULSUkAlE6mO1/Bh # JZcNnrGb91fJryuxGZZdV+qv1dlyYyMOVR65COzJ6l/9/qEwUNzSJy6VZenjFDp4 # ZlC9xBm1EphD1TzK80KqYlxHtAHl8zB88BLR03xvL06CRHsN4+xidZEWxnvddbgn # aF27mVS1qPv3MiLJShfRAnVbpOOqSqn4ObHZb2MGisQfENbUP0Hg1H4qVGOuf8HY # Lfb1BJy3BccqKk+ThOxhYRaFhVYVvT8Iwt+XxfuoagBeP8DFW7s= # =Unwi # -----END PGP SIGNATURE----- # gpg: Signature made Thu Sep 4 15:26:35 2025 CEST # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents bf57832 + 28c695c commit 14633f5

File tree

57 files changed

+512
-300
lines changed

Some content is hidden

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

57 files changed

+512
-300
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 = 1
4-
SUBLEVEL = 149
4+
SUBLEVEL = 150
55
EXTRAVERSION =
66
NAME = Curry Ramen
77

‎arch/mips/boot/dts/lantiq/danube_easy50712.dts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,16 @@
8282
};
8383
};
8484

85-
etop@e180000 {
85+
ethernet@e180000 {
8686
compatible = "lantiq,etop-xway";
8787
reg = <0xe180000 0x40000>;
8888
interrupt-parent = <&icu0>;
8989
interrupts = <73 78>;
90+
interrupt-names = "tx", "rx";
9091
phy-mode = "rmii";
9192
mac-address = [ 00 11 22 33 44 55 ];
93+
lantiq,rx-burst-length = <4>;
94+
lantiq,tx-burst-length = <4>;
9295
};
9396

9497
stp0: stp@e100bb0 {

‎arch/mips/lantiq/xway/sysctrl.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ void __init ltq_soc_init(void)
479479
ifccr = CGU_IFCCR_VR9;
480480
pcicr = CGU_PCICR_VR9;
481481
} else {
482-
clkdev_add_pmu("1e180000.etop", NULL, 1, 0, PMU_PPE);
482+
clkdev_add_pmu("1e180000.ethernet", NULL, 1, 0, PMU_PPE);
483483
}
484484

485485
if (!of_machine_is_compatible("lantiq,ase"))
@@ -513,9 +513,9 @@ void __init ltq_soc_init(void)
513513
CLOCK_133M, CLOCK_133M);
514514
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0);
515515
clkdev_add_pmu("1f203018.usb2-phy", "phy", 1, 0, PMU_USB0_P);
516-
clkdev_add_pmu("1e180000.etop", "ppe", 1, 0, PMU_PPE);
517-
clkdev_add_cgu("1e180000.etop", "ephycgu", CGU_EPHY);
518-
clkdev_add_pmu("1e180000.etop", "ephy", 1, 0, PMU_EPHY);
516+
clkdev_add_pmu("1e180000.ethernet", "ppe", 1, 0, PMU_PPE);
517+
clkdev_add_cgu("1e180000.ethernet", "ephycgu", CGU_EPHY);
518+
clkdev_add_pmu("1e180000.ethernet", "ephy", 1, 0, PMU_EPHY);
519519
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_ASE_SDIO);
520520
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);
521521
} else if (of_machine_is_compatible("lantiq,grx390")) {
@@ -574,7 +574,7 @@ void __init ltq_soc_init(void)
574574
clkdev_add_pmu("1e101000.usb", "otg", 1, 0, PMU_USB0 | PMU_AHBM);
575575
clkdev_add_pmu("1f203034.usb2-phy", "phy", 1, 0, PMU_USB1_P);
576576
clkdev_add_pmu("1e106000.usb", "otg", 1, 0, PMU_USB1 | PMU_AHBM);
577-
clkdev_add_pmu("1e180000.etop", "switch", 1, 0, PMU_SWITCH);
577+
clkdev_add_pmu("1e180000.ethernet", "switch", 1, 0, PMU_SWITCH);
578578
clkdev_add_pmu("1e103000.sdio", NULL, 1, 0, PMU_SDIO);
579579
clkdev_add_pmu("1e103100.deu", NULL, 1, 0, PMU_DEU);
580580
clkdev_add_pmu("1e116000.mei", "dfe", 1, 0, PMU_DFE);

‎arch/powerpc/kernel/kvm.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,28 +632,28 @@ static void __init kvm_check_ins(u32 *inst, u32 features)
632632
#endif
633633
}
634634

635-
switch (inst_no_rt & ~KVM_MASK_RB) {
636635
#ifdef CONFIG_PPC_BOOK3S_32
636+
switch (inst_no_rt & ~KVM_MASK_RB) {
637637
case KVM_INST_MTSRIN:
638638
if (features & KVM_MAGIC_FEAT_SR) {
639639
u32 inst_rb = _inst & KVM_MASK_RB;
640640
kvm_patch_ins_mtsrin(inst, inst_rt, inst_rb);
641641
}
642642
break;
643-
#endif
644643
}
644+
#endif
645645

646-
switch (_inst) {
647646
#ifdef CONFIG_BOOKE
647+
switch (_inst) {
648648
case KVM_INST_WRTEEI_0:
649649
kvm_patch_ins_wrteei_0(inst);
650650
break;
651651

652652
case KVM_INST_WRTEEI_1:
653653
kvm_patch_ins_wrtee(inst, 0, 1);
654654
break;
655-
#endif
656655
}
656+
#endif
657657
}
658658

659659
extern u32 kvm_template_start[];

‎arch/x86/kvm/lapic.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,8 @@ static int __pv_send_ipi(unsigned long *ipi_bitmap, struct kvm_apic_map *map,
684684
if (min > map->max_apic_id)
685685
return 0;
686686

687+
min = array_index_nospec(min, map->max_apic_id + 1);
688+
687689
for_each_set_bit(i, ipi_bitmap,
688690
min((u32)BITS_PER_LONG, (map->max_apic_id - min + 1))) {
689691
if (map->phys_map[min + i]) {

‎arch/x86/kvm/x86.c‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9681,8 +9681,11 @@ static void kvm_sched_yield(struct kvm_vcpu *vcpu, unsigned long dest_id)
96819681
rcu_read_lock();
96829682
map = rcu_dereference(vcpu->kvm->arch.apic_map);
96839683

9684-
if (likely(map) && dest_id <= map->max_apic_id && map->phys_map[dest_id])
9685-
target = map->phys_map[dest_id]->vcpu;
9684+
if (likely(map) && dest_id <= map->max_apic_id) {
9685+
dest_id = array_index_nospec(dest_id, map->max_apic_id + 1);
9686+
if (map->phys_map[dest_id])
9687+
target = map->phys_map[dest_id]->vcpu;
9688+
}
96869689

96879690
rcu_read_unlock();
96889691

‎drivers/acpi/ec.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2288,6 +2288,12 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = {
22882288
DMI_MATCH(DMI_PRODUCT_NAME, "83Q3"),
22892289
}
22902290
},
2291+
{
2292+
// TUXEDO InfinityBook Pro AMD Gen9
2293+
.matches = {
2294+
DMI_MATCH(DMI_BOARD_NAME, "GXxHRXx"),
2295+
},
2296+
},
22912297
{ },
22922298
};
22932299

‎drivers/atm/atmtcp.c‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,19 @@ static struct atm_vcc *find_vcc(struct atm_dev *dev, short vpi, int vci)
279279
return NULL;
280280
}
281281

282+
static int atmtcp_c_pre_send(struct atm_vcc *vcc, struct sk_buff *skb)
283+
{
284+
struct atmtcp_hdr *hdr;
285+
286+
if (skb->len < sizeof(struct atmtcp_hdr))
287+
return -EINVAL;
288+
289+
hdr = (struct atmtcp_hdr *)skb->data;
290+
if (hdr->length == ATMTCP_HDR_MAGIC)
291+
return -EINVAL;
292+
293+
return 0;
294+
}
282295

283296
static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
284297
{
@@ -288,9 +301,6 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
288301
struct sk_buff *new_skb;
289302
int result = 0;
290303

291-
if (skb->len < sizeof(struct atmtcp_hdr))
292-
goto done;
293-
294304
dev = vcc->dev_data;
295305
hdr = (struct atmtcp_hdr *) skb->data;
296306
if (hdr->length == ATMTCP_HDR_MAGIC) {
@@ -347,6 +357,7 @@ static const struct atmdev_ops atmtcp_v_dev_ops = {
347357

348358
static const struct atmdev_ops atmtcp_c_dev_ops = {
349359
.close = atmtcp_c_close,
360+
.pre_send = atmtcp_c_pre_send,
350361
.send = atmtcp_c_send
351362
};
352363

‎drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ int amdgpu_map_static_csa(struct amdgpu_device *adev, struct amdgpu_vm *vm,
9393
}
9494

9595
r = amdgpu_vm_bo_map(adev, *bo_va, csa_addr, 0, size,
96-
AMDGPU_VM_PAGE_READABLE | AMDGPU_VM_PAGE_WRITEABLE |
97-
AMDGPU_VM_PAGE_EXECUTABLE);
96+
AMDGPU_PTE_READABLE | AMDGPU_PTE_WRITEABLE |
97+
AMDGPU_PTE_EXECUTABLE);
9898

9999
if (r) {
100100
DRM_ERROR("failed to do bo_map on static CSA, err=%d\n", r);

‎drivers/gpu/drm/display/drm_dp_helper.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ ssize_t drm_dp_dpcd_read(struct drm_dp_aux *aux, unsigned int offset,
663663
* monitor doesn't power down exactly after the throw away read.
664664
*/
665665
if (!aux->is_remote) {
666-
ret = drm_dp_dpcd_probe(aux, DP_LANE0_1_STATUS);
666+
ret = drm_dp_dpcd_probe(aux, DP_DPCD_REV);
667667
if (ret < 0)
668668
return ret;
669669
}

0 commit comments

Comments
 (0)