rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-6.1.0-0.rc0.20221010git493ffd6605b2.7

Browse Source 
* Mon Oct 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.493ffd6605b2.7]
- Add acpi video to the filter_modules.sh for rhel (Justin M. Forbes)
- Change acpi_bus_get_acpi_device to acpi_get_acpi_dev (Justin M. Forbes)
- Turn on ACPI_VIDEO for arm (Justin M. Forbes)
- Turn on CONFIG_PRIME_NUMBERS as a module (Justin M. Forbes)
- Add new drm kunit tests to mod-internal.list (Justin M. Forbes)
- redhat: fix elf got hardening for vm tools (Frantisek Hrbata)
- kernel.spec.template: remove some temporary files early (Ondrej Mosnacek)
- kernel.spec.template: avoid keeping two copies of vmlinux (Ondrej Mosnacek)
- Linux v6.1.0-0.rc0.493ffd6605b2
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-10-10 07:34:57 -05:00
parent 82e2cd5d6b
commit 9e3155cd9e
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
25 changed files with 86 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Patchlist.changelog
View File

@ -1,5 +1,5 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/5290f1bdc61ee240fa695f04d3ca7cb082da8e64
5290f1bdc61ee240fa695f04d3ca7cb082da8e64 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
"https://gitlab.com/cki-project/kernel-ark/-/commit"/a5465769aab281eaccf26b6b2c1659e26de74074
a5465769aab281eaccf26b6b2c1659e26de74074 Change acpi_bus_get_acpi_device to acpi_get_acpi_dev
"https://gitlab.com/cki-project/kernel-ark/-/commit"/99d7ef3159706a0c7d0dfa0335b13d7f39bae9c4
99d7ef3159706a0c7d0dfa0335b13d7f39bae9c4 drm: Prevent drm_copy_field() to attempt copying a NULL pointer

2
kernel-aarch64-debug-fedora.config
View File

@ -2156,6 +2156,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5591,6 +5592,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-aarch64-debug-rhel.config
View File

@ -1660,6 +1660,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4397,6 +4398,7 @@ CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNP_DEBUG_MESSAGES=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWERCAP is not set
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

2
kernel-aarch64-fedora.config
View File

@ -2148,6 +2148,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5570,6 +5571,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-aarch64-rhel.config
View File

@ -1652,6 +1652,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4374,6 +4375,7 @@ CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_PNP_DEBUG_MESSAGES=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWERCAP is not set
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

2
kernel-armv7hl-debug-fedora.config
View File

@ -2157,6 +2157,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5598,6 +5599,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-armv7hl-fedora.config
View File

@ -2150,6 +2150,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5579,6 +5580,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -2111,6 +2111,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5473,6 +5474,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-armv7hl-lpae-fedora.config
View File

@ -2104,6 +2104,7 @@ CONFIG_EFIVAR_FS=y
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
CONFIG_EMAC_ROCKCHIP=m
# CONFIG_EMBEDDED is not set
@ -5454,6 +5455,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-ppc64le-debug-fedora.config
View File

@ -1674,6 +1674,7 @@ CONFIG_EFI_PGT_DUMP=y
CONFIG_EFI_SECRET=m
CONFIG_EFI_SOFT_RESERVE=y
CONFIG_EFI_TEST=m
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
# CONFIG_ENA_ETHERNET is not set
@ -4651,6 +4652,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
CONFIG_POWER8_CPU=y
# CONFIG_POWER9_CPU is not set

2
kernel-ppc64le-debug-rhel.config
View File

@ -1490,6 +1490,7 @@ CONFIG_EFI_PARTITION=y
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4147,6 +4148,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
CONFIG_POWER9_CPU=y

2
kernel-ppc64le-fedora.config
View File

@ -1665,6 +1665,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_SECRET=m
CONFIG_EFI_SOFT_RESERVE=y
CONFIG_EFI_TEST=m
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
# CONFIG_ENA_ETHERNET is not set
@ -4630,6 +4631,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
CONFIG_POWER8_CPU=y
# CONFIG_POWER9_CPU is not set

2
kernel-ppc64le-rhel.config
View File

@ -1482,6 +1482,7 @@ CONFIG_EFI_PARTITION=y
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4126,6 +4127,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
CONFIG_POWER9_CPU=y

2
kernel-s390x-debug-fedora.config
View File

@ -1681,6 +1681,7 @@ CONFIG_EFI_PGT_DUMP=y
CONFIG_EFI_SECRET=m
CONFIG_EFI_SOFT_RESERVE=y
CONFIG_EFI_TEST=m
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
# CONFIG_ENA_ETHERNET is not set
@ -4625,6 +4626,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-s390x-debug-rhel.config
View File

@ -1495,6 +1495,7 @@ CONFIG_EFI_PARTITION=y
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4130,6 +4131,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWERCAP is not set
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

2
kernel-s390x-fedora.config
View File

@ -1672,6 +1672,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_EFI_SECRET=m
CONFIG_EFI_SOFT_RESERVE=y
CONFIG_EFI_TEST=m
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EMBEDDED is not set
# CONFIG_ENA_ETHERNET is not set
@ -4604,6 +4605,7 @@ CONFIG_PM_TRACE=y
CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-s390x-rhel.config
View File

@ -1487,6 +1487,7 @@ CONFIG_EFI_PARTITION=y
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4109,6 +4110,7 @@ CONFIG_PM=y
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWERCAP is not set
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

4
kernel-s390x-zfcpdump-rhel.config
View File

@ -1492,6 +1492,7 @@ CONFIG_EFI_PARTITION=y
# CONFIG_EFI_RCI2_TABLE is not set
CONFIG_EFI_SOFT_RESERVE=y
# CONFIG_EFI_TEST is not set
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
CONFIG_ELF_CORE=y
@ -4123,6 +4124,7 @@ CONFIG_PM_STD_PARTITION="/dev/jokes"
CONFIG_PNFS_BLOCK=m
CONFIG_PNFS_FILE_LAYOUT=m
# CONFIG_POSIX_MQUEUE is not set
# CONFIG_POWER10_CPU is not set
# CONFIG_POWERCAP is not set
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y
@ -4168,7 +4170,7 @@ CONFIG_PREEMPT_NOTIFIERS=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PRESTERA is not set
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_PRIME_NUMBERS=y
# CONFIG_PRIME_NUMBERS is not set
CONFIG_PRINTER=m
# CONFIG_PRINTK_CALLER is not set
CONFIG_PRINTK_INDEX=y

2
kernel-x86_64-debug-fedora.config
View File

@ -1835,6 +1835,7 @@ CONFIG_EFIVAR_FS=y
# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
# CONFIG_EFI_VARS_PSTORE is not set
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -5026,6 +5027,7 @@ CONFIG_PNPACPI=y
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_PNP=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-x86_64-debug-rhel.config
View File

@ -1597,6 +1597,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4358,6 +4359,7 @@ CONFIG_PNPACPI=y
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_PNP=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
CONFIG_POWERCAP=y
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

2
kernel-x86_64-fedora.config
View File

@ -1826,6 +1826,7 @@ CONFIG_EFIVAR_FS=y
# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
# CONFIG_EFI_VARS_PSTORE is not set
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -5006,6 +5007,7 @@ CONFIG_PNPACPI=y
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_PNP=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
# CONFIG_POWER7_CPU is not set
# CONFIG_POWER8_CPU is not set
# CONFIG_POWER9_CPU is not set

2
kernel-x86_64-rhel.config
View File

@ -1589,6 +1589,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS=y
CONFIG_EFI=y
# CONFIG_EFI_ZBOOT is not set
# CONFIG_EFS_FS is not set
# CONFIG_EISA is not set
# CONFIG_EMBEDDED is not set
@ -4336,6 +4337,7 @@ CONFIG_PNPACPI=y
# CONFIG_PNP_DEBUG_MESSAGES is not set
CONFIG_PNP=y
CONFIG_POSIX_MQUEUE=y
# CONFIG_POWER10_CPU is not set
CONFIG_POWERCAP=y
# CONFIG_POWER_MLXBF is not set
CONFIG_POWERNV_CPUFREQ=y

23
kernel.spec
View File

@ -124,13 +124,13 @@ Summary: The Linux kernel
# define buildid .local
%define specversion 6.1.0
%define patchversion 6.1
%define pkgrelease 0.rc0.20221009gita6afa4199d3d.7
%define pkgrelease 0.rc0.20221010git493ffd6605b2.7
%define kversion 6
%define tarfile_release 6.0-9039-ga6afa4199d3d
%define tarfile_release 6.0-9423-g493ffd6605b2
# This is needed to do merge window version magic
%define patchlevel 1
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc0.20221009gita6afa4199d3d.7%{?buildid}%{?dist}
%define specrelease 0.rc0.20221010git493ffd6605b2.7%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.1.0
@ -1677,6 +1677,9 @@ BuildKernel() {
find arch/$Arch/boot/dts -name '*.dtb' -type f -delete
%endif
# Remove large intermediate files we no longer need to save space
rm vmlinux.o .tmp_vmlinux.btf
# Start installing the results
install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
install -m 644 .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/config
@ -2020,9 +2023,11 @@ BuildKernel() {
#
# save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
# (use mv + symlink instead of cp to reduce disk space requirements)
#
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
mv vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
ln -s $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux vmlinux
if [ -n "%{vmlinux_decompressor}" ]; then
eu-readelf -n %{vmlinux_decompressor} | grep "Build ID" | awk '{print $NF}' > vmlinux.decompressor.id
# Without build-id the build will fail. But for s390 the build-id
@ -2327,7 +2332,7 @@ pushd tools/gpio/
popd
# build VM tools
pushd tools/vm/
%{tools_make} slabinfo page_owner_sort
%{tools_make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" slabinfo page_owner_sort
popd
pushd tools/tracing/rtla
%{tools_make}
@ -3180,10 +3185,16 @@ fi
#
#
%changelog
* Sun Oct 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a6afa4199d3d.7]
* Mon Oct 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.493ffd6605b2.7]
- Add acpi video to the filter_modules.sh for rhel (Justin M. Forbes)
- Change acpi_bus_get_acpi_device to acpi_get_acpi_dev (Justin M. Forbes)
- Turn on ACPI_VIDEO for arm (Justin M. Forbes)
- Turn on CONFIG_PRIME_NUMBERS as a module (Justin M. Forbes)
- Add new drm kunit tests to mod-internal.list (Justin M. Forbes)
- redhat: fix elf got hardening for vm tools (Frantisek Hrbata)
- kernel.spec.template: remove some temporary files early (Ondrej Mosnacek)
- kernel.spec.template: avoid keeping two copies of vmlinux (Ondrej Mosnacek)
- Linux v6.1.0-0.rc0.493ffd6605b2
* Sun Oct 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.1.0-0.rc0.a6afa4199d3d.6]
- Linux v6.1.0-0.rc0.a6afa4199d3d

42
patch-6.1-redhat.patch
View File

@ -67,7 +67,7 @@
66 files changed, 1540 insertions(+), 187 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 02ee2e2405e7..eda361d0db56 100644
index b2413342b309..6d72eef46282 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6417,6 +6417,15 @@
@ -215,10 +215,10 @@ index a405b6bb89fb..50827b341fd7 100644
/*
* DIAG 308 support
diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index 1cc85b8ff42e..b7ee128c67ce 100644
index 325cbf69ebbd..1801af7a6ec4 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -2216,3 +2216,8 @@ int ipl_report_free(struct ipl_report *report)
@@ -2221,3 +2221,8 @@ int ipl_report_free(struct ipl_report *report)
}
#endif
@ -228,7 +228,7 @@ index 1cc85b8ff42e..b7ee128c67ce 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index bbd4bde4f65d..dd60114ae9c1 100644
index ab19ddb09d65..d463ec57b218 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
@ -239,7 +239,7 @@ index bbd4bde4f65d..dd60114ae9c1 100644
#include <linux/hugetlb.h>
#include <linux/kmemleak.h>
@@ -968,6 +969,9 @@ void __init setup_arch(char **cmdline_p)
@@ -978,6 +979,9 @@ void __init setup_arch(char **cmdline_p)
log_component_list();
@ -560,10 +560,10 @@ index 8d151e332584..bd29fe4ddbf3 100644
obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o
obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index e4080ad96089..e050d2f8dbe5 100644
index 11857af72859..67ce560e80ff 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -31,6 +31,7 @@
@@ -32,6 +32,7 @@
#include <linux/ucs2_string.h>
#include <linux/memblock.h>
#include <linux/security.h>
@ -571,7 +571,7 @@ index e4080ad96089..e050d2f8dbe5 100644
#include <asm/early_ioremap.h>
@@ -864,40 +865,101 @@ int efi_mem_type(unsigned long phys_addr)
@@ -879,40 +880,101 @@ int efi_mem_type(unsigned long phys_addr)
}
#endif
@ -1779,7 +1779,7 @@ index eae288c8d40a..8b8bf447cedc 100644
error_proc:
diff --git a/include/linux/efi.h b/include/linux/efi.h
index d2b84c2fec39..3498d72b62ec 100644
index da3974bf05d3..cd7fad7eef44 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -43,6 +43,8 @@
@ -1791,7 +1791,7 @@ index d2b84c2fec39..3498d72b62ec 100644
typedef unsigned long efi_status_t;
typedef u8 efi_bool_t;
typedef u16 efi_char16_t; /* UNICODE character */
@@ -849,6 +851,14 @@ extern int __init efi_setup_pcdp_console(char *);
@@ -863,6 +865,14 @@ extern int __init efi_setup_pcdp_console(char *);
#define EFI_MEM_ATTR 10 /* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
#define EFI_MEM_NO_SOFT_RESERVE 11 /* Is the kernel configured to ignore soft reservations? */
#define EFI_PRESERVE_BS_REGIONS 12 /* Are EFI boot-services memory segments available? */
@ -1806,7 +1806,7 @@ index d2b84c2fec39..3498d72b62ec 100644
#ifdef CONFIG_EFI
/*
@@ -860,6 +870,8 @@ static inline bool efi_enabled(int feature)
@@ -874,6 +884,8 @@ static inline bool efi_enabled(int feature)
}
extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
@ -1815,7 +1815,7 @@ index d2b84c2fec39..3498d72b62ec 100644
bool __pure __efi_soft_reserve_enabled(void);
static inline bool __pure efi_soft_reserve_enabled(void)
@@ -881,6 +893,8 @@ static inline bool efi_enabled(int feature)
@@ -895,6 +907,8 @@ static inline bool efi_enabled(int feature)
static inline void
efi_reboot(enum reboot_mode reboot_mode, const char *__unused) {}
@ -1824,7 +1824,7 @@ index d2b84c2fec39..3498d72b62ec 100644
static inline bool efi_soft_reserve_enabled(void)
{
return false;
@@ -895,6 +909,7 @@ static inline void efi_find_mirror(void) {}
@@ -909,6 +923,7 @@ static inline void efi_find_mirror(void) {}
#endif
extern int efi_status_to_err(efi_status_t status);
@ -1832,7 +1832,7 @@ index d2b84c2fec39..3498d72b62ec 100644
/*
* Variable Attributes
@@ -1107,13 +1122,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
@@ -1137,13 +1152,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
extern unsigned long efi_call_virt_save_flags(void);
@ -2508,10 +2508,10 @@ index ab7eea01ab42..fff7c5f737fc 100644
int rmi_register_transport_device(struct rmi_transport_dev *xport);
diff --git a/include/linux/security.h b/include/linux/security.h
index 87fac3af6dad..804c897f07a8 100644
index ca1b7109c0db..b947cfbf04c2 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -476,6 +476,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
@@ -478,6 +478,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen);
int security_inode_setsecctx(struct dentry *dentry, void *ctx, u32 ctxlen);
int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen);
int security_locked_down(enum lockdown_reason what);
@ -2519,7 +2519,7 @@ index 87fac3af6dad..804c897f07a8 100644
#else /* CONFIG_SECURITY */
static inline int call_blocking_lsm_notifier(enum lsm_event event, void *data)
@@ -1364,6 +1365,10 @@ static inline int security_locked_down(enum lockdown_reason what)
@@ -1366,6 +1367,10 @@ static inline int security_locked_down(enum lockdown_reason what)
{
return 0;
}
@ -2531,10 +2531,10 @@ index 87fac3af6dad..804c897f07a8 100644
#if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
diff --git a/init/Kconfig b/init/Kconfig
index a078cb026523..d469f8570952 100644
index 751ca3dd1d22..9df6045bdd65 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1690,7 +1690,7 @@ config AIO
@@ -1689,7 +1689,7 @@ config AIO
this option saves about 7k.
config IO_URING
@ -2992,10 +2992,10 @@ index a79b985e917e..772a69bf43ec 100644
static int __init lockdown_lsm_init(void)
diff --git a/security/security.c b/security/security.c
index 8312b3bf1169..219ea9552aa6 100644
index 79d82cb6e469..843b0dd8f0dd 100644
--- a/security/security.c
+++ b/security/security.c
@@ -2628,6 +2628,12 @@ int security_locked_down(enum lockdown_reason what)
@@ -2630,6 +2630,12 @@ int security_locked_down(enum lockdown_reason what)
}
EXPORT_SYMBOL(security_locked_down);

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-6.0-9039-ga6afa4199d3d.tar.xz) = ffde8d4ed231beedef9113c91ea052bbafb33582ffda0c08d7c0e5f1db648dcfc5cdf9850cee7bb7fcf935008cadb5fd5344c11b387d09ba8854493222537381
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = d8b7abf17cc77ea67d13746444fe9785a70e60937bfe78ad2de6c692a32fe51fbfc7ec374db55dac6959927b8b81af9e74679601317d065b7a952566687ddaa8
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = f6dff845b9174405770140a73e6c21d6287f337c8d77d84cd35bf4e87185eda4d80da210f742a7d39d86b6e574bb55becb7e36308f62a2beb5844a4cfc4129b0
SHA512 (linux-6.0-9423-g493ffd6605b2.tar.xz) = 2361963d2f5c202fb78c0484bcd30f2fa5e18c65323f34873c4544269404b07c9fae600d545149917943188076ba4af331e0ad1c40ce8c03501d626377fa0976
SHA512 (kernel-abi-stablelists-6.1.0.tar.bz2) = 5ad88d41fd462bb2d91a4d48939024a3ecb60a90ec7b5e4e37f6173353271203fded03835d216ee346692ae065392561256c08a12c0167a5624712c3b330dfd4
SHA512 (kernel-kabi-dw-6.1.0.tar.bz2) = 42be3bcceb565aecbb8077c242db802a0179b75693af4df76bcd34cf5d8c5281b01ea849167a27ac54423ebb8a98b1c4cf5ae0bc7d4508248c4b33fb316c6aec