Skip to content

Commit 7dae70e

Browse files
committed
Merge tag 'kernel-6.12.0-124.7.1.el10_1' into main
JIRA: INTERNAL Upstream Status: RHEL only Omit changes to Makefile.rhelver. Signed-off-by: Jan Stancek <jstancek@redhat.com>
2 parents 14c3cf9 + 6ac9bdd commit 7dae70e

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "amdgpu_ras.h"
4646

4747
MODULE_FIRMWARE("amdgpu/sdma_4_4_2.bin");
48+
MODULE_FIRMWARE("amdgpu/sdma_4_4_4.bin");
4849
MODULE_FIRMWARE("amdgpu/sdma_4_4_5.bin");
4950

5051
static const struct amdgpu_hwip_reg_entry sdma_reg_list_4_4_2[] = {

redhat/kernel.changelog-10.1

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
* Wed Oct 08 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-124.7.1.el10_1]
2+
- drm/amdgpu: Include sdma_4_4_4.bin (Peter Colberg) [RHEL-117567]
3+
Resolves: RHEL-117567
4+
5+
* Tue Oct 07 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-124.6.1.el10_1]
6+
- redhat: use new x86/aarch64 signing key (801/804) (Jan Stancek) [RHEL-116728]
7+
Resolves: RHEL-116728
8+
19
* Mon Sep 29 2025 Jan Stancek <jstancek@redhat.com> [6.12.0-124.5.1.el10_1]
210
- scsi: mpi3mr: Update driver version to 8.15.0.5.50 (Chandrakanth Patil) [RHEL-111654]
311
- scsi: mpi3mr: Fix premature TM timeouts on virtual drives (Chandrakanth Patil) [RHEL-111654]

redhat/kernel.spec.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ Source13: redhatsecureboot501.cer
933933
%define pesign_name_0 centossecureboot201
934934
%else
935935
%ifarch x86_64 aarch64
936-
%define pesign_name_0 redhatsecureboot501
936+
%define pesign_name_0 redhatsecureboot801
937937
%endif
938938
%ifarch s390x
939939
%define pesign_name_0 redhatsecureboot302
@@ -2795,7 +2795,7 @@ BuildKernel() {
27952795
%if 0%{?centos}
27962796
UKI_secureboot_name=centossecureboot204
27972797
%else
2798-
UKI_secureboot_name=redhatsecureboot504
2798+
UKI_secureboot_name=redhatsecureboot804
27992799
%endif
28002800
UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer
28012801

0 commit comments

Comments
 (0)