Skip to content

Commit 32f8780

Browse files
committed
Rebuild rocky8_10 with kernel-4.18.0-553.53.1.el8_10
Rebuild_History BUILDABLE Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50% Number of commits in upstream range v4.18~1..kernel-mainline: 540031 Number of commits in rpm: 23 Number of commits matched with upstream: 17 (73.91%) Number of commits in upstream but not in rpm: 540014 Number of commits NOT found in upstream: 6 (26.09%) Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.53.1.el8_10 for kernel-4.18.0-553.53.1.el8_10 Clean Cherry Picks: 11 (64.71%) Empty Cherry Picks: 6 (35.29%) _______________________________ Full Details Located here: ciq/ciq_backports/kernel-4.18.0-553.53.1.el8_10/rebuild.details.txt Includes: * git commit header above * Empty Commits with upstream SHA * RPM ChangeLog Entries that could not be matched Individual Empty Commit failures contained in the same containing directory. The git message for empty commits will have the path for the failed commit. File names are the first 8 characters of the upstream SHA
1 parent a6311dd commit 32f8780

14 files changed

+49950
-62
lines changed

Makefile.rhelver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RHEL_MINOR = 10
1212
#
1313
# Use this spot to avoid future merge conflicts.
1414
# Do not trim this comment.
15-
RHEL_RELEASE = 553.52.1
15+
RHEL_RELEASE = 553.53.1
1616

1717
#
1818
# ZSTREAM

arch/x86/kernel/machine_kexec_64.c

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <asm/kexec-bzimage64.h>
3131
#include <asm/setup.h>
3232
#include <asm/set_memory.h>
33+
#include <asm/efi.h>
3334

3435
#ifdef CONFIG_ACPI
3536
/*
@@ -92,6 +93,8 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
9293
{
9394
#ifdef CONFIG_EFI
9495
unsigned long mstart, mend;
96+
void *kaddr;
97+
int ret;
9598

9699
if (!efi_enabled(EFI_BOOT))
97100
return 0;
@@ -107,6 +110,30 @@ map_efi_systab(struct x86_mapping_info *info, pgd_t *level4p)
107110
if (!mstart)
108111
return 0;
109112

113+
ret = kernel_ident_mapping_init(info, level4p, mstart, mend);
114+
if (ret)
115+
return ret;
116+
117+
kaddr = memremap(mstart, mend - mstart, MEMREMAP_WB);
118+
if (!kaddr) {
119+
pr_err("Could not map UEFI system table\n");
120+
return -ENOMEM;
121+
}
122+
123+
mstart = efi.config_table;
124+
125+
if (efi_enabled(EFI_64BIT)) {
126+
efi_system_table_64_t *stbl = (efi_system_table_64_t *)kaddr;
127+
128+
mend = mstart + sizeof(efi_config_table_64_t) * stbl->nr_tables;
129+
} else {
130+
efi_system_table_32_t *stbl = (efi_system_table_32_t *)kaddr;
131+
132+
mend = mstart + sizeof(efi_config_table_32_t) * stbl->nr_tables;
133+
}
134+
135+
memunmap(kaddr);
136+
110137
return kernel_ident_mapping_init(info, level4p, mstart, mend);
111138
#endif
112139
return 0;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Rebuild_History BUILDABLE
2+
Rebuilding Kernel from rpm changelog with Fuzz Limit: 87.50%
3+
Number of commits in upstream range v4.18~1..kernel-mainline: 540031
4+
Number of commits in rpm: 23
5+
Number of commits matched with upstream: 17 (73.91%)
6+
Number of commits in upstream but not in rpm: 540014
7+
Number of commits NOT found in upstream: 6 (26.09%)
8+
9+
Rebuilding Kernel on Branch rocky8_10_rebuild_kernel-4.18.0-553.53.1.el8_10 for kernel-4.18.0-553.53.1.el8_10
10+
Clean Cherry Picks: 11 (64.71%)
11+
Empty Cherry Picks: 6 (35.29%)
12+
_______________________________
13+
14+
__EMPTY COMMITS__________________________
15+
135ffc7becc82cfb84936ae133da7969220b43b2 bpf, vsock: Invoke proto::close on close()
16+
fcdd2242c0231032fc84e1404315c245ae56322a vsock: Keep the binding until socket destruction
17+
78dafe1cf3afa02ed71084b350713b07e72a18fb vsock: Orphan socket after transport release
18+
5760929f6545c651682de3c2c6c6786816b17bb1 x86/kexec: Add EFI config table identity mapping for kexec kernel
19+
eaa1dcc79694674494620ee62098b937ef758df8 platform/x86: dell-wmi-sysman: Cleanup sysman_init() error-exit handling
20+
9b95665a83ec555f441f5681daa58f75828d0255 platform/x86: dell-wmi-sysman: Make sysman_init() return -ENODEV of the interfaces are not found
21+
22+
__CHANGES NOT IN UPSTREAM________________
23+
Adding prod certs and changed cert date to 20210620
24+
Adding Rocky secure boot certs
25+
Fixing vmlinuz removal
26+
Fixing UEFI CA path
27+
Porting to 8.10, debranding and Rocky branding
28+
Fixing pesign_key_name values

0 commit comments

Comments
 (0)