From 52b79c210e845811ec78b9694996c033c4d575c3 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 2 May 2025 07:35:55 -0600 Subject: [PATCH] kernel-6.14.5-200 * Fri May 02 2025 Justin M. Forbes [6.14.5-0] - Fix up configs for 6.14.5 merge (Justin M. Forbes) - Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) - Linux v6.14.5 Resolves: Signed-off-by: Justin M. Forbes --- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 4 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 4 +- kernel-aarch64-rt-debug-fedora.config | 2 +- kernel-aarch64-rt-fedora.config | 4 +- kernel-ppc64le-debug-fedora.config | 4 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-fedora.config | 6 +- kernel-ppc64le-rhel.config | 2 +- kernel-riscv64-debug-fedora.config | 2 +- kernel-riscv64-fedora.config | 4 +- kernel-riscv64-rt-debug-fedora.config | 2 +- kernel-riscv64-rt-fedora.config | 4 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 4 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 4 +- kernel-x86_64-rt-debug-fedora.config | 2 +- kernel-x86_64-rt-fedora.config | 4 +- kernel.changelog | 6 + kernel.spec | 16 +- patch-6.14-redhat.patch | 213 +++++-------------------- sources | 6 +- 24 files changed, 96 insertions(+), 207 deletions(-) diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 3619db3fa..f8c340f31 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6044,7 +6044,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index e12f87614..f86496b0a 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -6016,7 +6016,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 1097c43af..c3f391b07 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6043,7 +6043,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index a3172a15a..93dc55ae0 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -6015,7 +6015,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index c09a613d0..118fcf315 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -6048,7 +6048,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 59ebb823b..414bdab32 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -57,7 +57,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -6020,7 +6020,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI_TEGRA=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 8bd499fe0..4f7770408 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1123,7 +1123,7 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20=m -# CONFIG_CRYPTO_CHACHA20_P10 is not set +CONFIG_CRYPTO_CHACHA20_P10=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_VPMSUM=m @@ -5015,7 +5015,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 223d4c8f4..d2bd8c84d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -983,7 +983,7 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20=m -# CONFIG_CRYPTO_CHACHA20_P10 is not set +CONFIG_CRYPTO_CHACHA20_P10=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y # CONFIG_CRYPTO_CRC32C_VPMSUM is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c839e0074..59253e954 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -52,7 +52,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y @@ -1122,7 +1122,7 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20=m -# CONFIG_CRYPTO_CHACHA20_P10 is not set +CONFIG_CRYPTO_CHACHA20_P10=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y CONFIG_CRYPTO_CRC32C_VPMSUM=m @@ -4986,7 +4986,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f82e25583..9fc891417 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -983,7 +983,7 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CCM=y CONFIG_CRYPTO_CHACHA20=m -# CONFIG_CRYPTO_CHACHA20_P10 is not set +CONFIG_CRYPTO_CHACHA20_P10=y CONFIG_CRYPTO_CHACHA20POLY1305=m CONFIG_CRYPTO_CMAC=y # CONFIG_CRYPTO_CRC32C_VPMSUM is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 19f47f323..3254fe537 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5040,7 +5040,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index 15400992a..f8260bdb8 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -5011,7 +5011,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-rt-debug-fedora.config b/kernel-riscv64-rt-debug-fedora.config index a25e1b063..24c91ea40 100644 --- a/kernel-riscv64-rt-debug-fedora.config +++ b/kernel-riscv64-rt-debug-fedora.config @@ -5045,7 +5045,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-riscv64-rt-fedora.config b/kernel-riscv64-rt-fedora.config index a52d7b1ca..5c39c0da2 100644 --- a/kernel-riscv64-rt-fedora.config +++ b/kernel-riscv64-rt-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ=m # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_DOCK is not set # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y @@ -5016,7 +5016,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index c5dce83d6..971e6f0ae 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4984,7 +4984,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e49443875..86f462521 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -53,7 +53,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_EC=y CONFIG_ACPI_FAN=y @@ -4955,7 +4955,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 456a919db..406cc56be 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5444,7 +5444,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index daf090c23..9f768cba8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -56,7 +56,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y # CONFIG_ACPI_EC_DEBUGFS is not set @@ -5417,7 +5417,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-rt-debug-fedora.config b/kernel-x86_64-rt-debug-fedora.config index 709b73d72..41fb32e63 100644 --- a/kernel-x86_64-rt-debug-fedora.config +++ b/kernel-x86_64-rt-debug-fedora.config @@ -5449,7 +5449,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel-x86_64-rt-fedora.config b/kernel-x86_64-rt-fedora.config index 6f721b75c..87fbba406 100644 --- a/kernel-x86_64-rt-fedora.config +++ b/kernel-x86_64-rt-fedora.config @@ -56,7 +56,7 @@ CONFIG_ACPI_CPPC_CPUFREQ_FIE=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set -# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_DEBUG=y CONFIG_ACPI_DOCK=y CONFIG_ACPI_DPTF=y # CONFIG_ACPI_EC_DEBUGFS is not set @@ -5422,7 +5422,7 @@ CONFIG_PCI_PF_STUB=m CONFIG_PCI_PRI=y CONFIG_PCI_PWRCTL_PWRSEQ=m CONFIG_PCI_QUIRKS=y -CONFIG_PCI_REALLOC_ENABLE_AUTO=y +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set CONFIG_PCI_STUB=y CONFIG_PCI_SW_SWITCHTEC=m CONFIG_PCI=y diff --git a/kernel.changelog b/kernel.changelog index 6a2ae2a8f..714d6dce8 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Fri May 02 2025 Justin M. Forbes [6.14.5-0] +- Fix up configs for 6.14.5 merge (Justin M. Forbes) +- Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) +- Linux v6.14.5 +Resolves: + * Fri Apr 25 2025 Justin M. Forbes [6.14.4-0] - Add F41 and F40 to release targets (Justin M. Forbes) - Linux v6.14.4 diff --git a/kernel.spec b/kernel.spec index 1fe119cc7..a7c812b14 100644 --- a/kernel.spec +++ b/kernel.spec @@ -159,18 +159,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.14.4 -%define specversion 6.14.4 +%define specrpmversion 6.14.5 +%define specversion 6.14.5 %define patchversion 6.14 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.14.4 +%define tarfile_release 6.14.5 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.14.4 +%define kabiversion 6.14.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4205,6 +4205,14 @@ fi\ # # %changelog +* Fri May 02 2025 Justin M. Forbes [6.14.5-200] +- Turn on ACPI_DEBUG for Fedora (Justin M. Forbes) + +* Fri May 02 2025 Justin M. Forbes [6.14.5-0] +- Fix up configs for 6.14.5 merge (Justin M. Forbes) +- Turn off CONFIG_PCI_REALLOC_ENABLE_AUTO for Fedora (Justin M. Forbes) +- Linux v6.14.5 + * Fri Apr 25 2025 Justin M. Forbes [6.14.4-0] - Add F41 and F40 to release targets (Justin M. Forbes) - Linux v6.14.4 diff --git a/patch-6.14-redhat.patch b/patch-6.14-redhat.patch index 7a892e387..5443ac688 100644 --- a/patch-6.14-redhat.patch +++ b/patch-6.14-redhat.patch @@ -1,42 +1,41 @@ Documentation/ABI/testing/sysfs-kernel-fadump | 3 +- - .../arch/powerpc/firmware-assisted-dump.rst | 22 +++ - Makefile | 40 +++++ + .../arch/powerpc/firmware-assisted-dump.rst | 22 ++++ + Makefile | 40 +++++++ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- arch/powerpc/include/asm/prom.h | 2 + - arch/powerpc/kernel/fadump.c | 21 +-- + arch/powerpc/kernel/fadump.c | 21 ++-- arch/powerpc/kernel/module_64.c | 4 - arch/powerpc/kernel/prom_init.c | 2 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + - arch/x86/kernel/setup.c | 22 ++- + arch/x86/kernel/setup.c | 22 ++-- arch/x86/tools/insn_decoder_test.c | 2 +- crypto/akcipher.c | 3 +- - crypto/dh.c | 25 ++++ - crypto/seqiv.c | 15 +- + crypto/dh.c | 25 +++++ + crypto/seqiv.c | 15 ++- crypto/sig.c | 3 +- crypto/testmgr.c | 6 +- - drivers/acpi/apei/hest.c | 8 + + drivers/acpi/apei/hest.c | 8 ++ drivers/acpi/irq.c | 17 ++- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ - drivers/char/ipmi/ipmi_dmi.c | 15 ++ - drivers/char/ipmi/ipmi_msghandler.c | 16 +- + drivers/char/ipmi/ipmi_dmi.c | 15 +++ + drivers/char/ipmi/ipmi_msghandler.c | 16 ++- drivers/firmware/efi/Makefile | 1 + - drivers/firmware/efi/efi.c | 124 ++++++++++++---- - drivers/firmware/efi/secureboot.c | 38 +++++ - drivers/hid/hid-rmi.c | 66 --------- - drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++ - drivers/input/rmi4/rmi_driver.c | 124 +++++++++------- - drivers/iommu/iommu.c | 22 +++ - drivers/media/i2c/ov08x40.c | 162 +++++++++++---------- - drivers/misc/mei/vsc-tp.c | 26 ++-- - drivers/pci/quirks.c | 24 +++ + drivers/firmware/efi/efi.c | 124 +++++++++++++++------ + drivers/firmware/efi/secureboot.c | 38 +++++++ + drivers/hid/hid-rmi.c | 66 ----------- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ + drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- + drivers/iommu/iommu.c | 22 ++++ + drivers/media/i2c/ov08x40.c | 108 +++++++++--------- + drivers/pci/quirks.c | 24 ++++ drivers/scsi/sd.c | 10 ++ - drivers/usb/core/hub.c | 7 + + drivers/usb/core/hub.c | 7 ++ include/linux/crypto.h | 2 + - include/linux/efi.h | 22 ++- + include/linux/efi.h | 22 ++-- include/linux/lsm_hook_defs.h | 1 + include/linux/rmi.h | 1 + include/linux/security.h | 9 ++ @@ -44,9 +43,9 @@ scripts/Makefile.extrawarn | 4 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- - security/lockdown/Kconfig | 13 ++ + security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 11 ++ - 48 files changed, 679 insertions(+), 293 deletions(-) + 47 files changed, 635 insertions(+), 257 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-fadump b/Documentation/ABI/testing/sysfs-kernel-fadump index 2f9daa7ca55b..b64b7622e6fc 100644 @@ -93,7 +92,7 @@ index 7e37aadd1f77..7e266e749cd5 100644 ----------------------- diff --git a/Makefile b/Makefile -index 0c1b99da2c1f..ffe600e452a7 100644 +index 87835d7abbce..58f40cfa39cc 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -133,7 +132,7 @@ index 0c1b99da2c1f..ffe600e452a7 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1917,6 +1940,23 @@ endif +@@ -1918,6 +1941,23 @@ endif ifdef CONFIG_MODULES @@ -1233,7 +1232,7 @@ index 2168b6cd7167..5d7cda175a0c 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index e3df1f06afbe..7499cb16693a 100644 +index 1efe7cddb4fe..e5cb44fab8dc 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1244,7 +1243,7 @@ index e3df1f06afbe..7499cb16693a 100644 #include #include #include -@@ -2909,6 +2910,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) +@@ -2912,6 +2913,27 @@ int iommu_dev_disable_feature(struct device *dev, enum iommu_dev_features feat) } EXPORT_SYMBOL_GPL(iommu_dev_disable_feature); @@ -1273,7 +1272,7 @@ index e3df1f06afbe..7499cb16693a 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/media/i2c/ov08x40.c b/drivers/media/i2c/ov08x40.c -index 83b49cf114ac..54575eea3c49 100644 +index 625fbcd39068..54575eea3c49 100644 --- a/drivers/media/i2c/ov08x40.c +++ b/drivers/media/i2c/ov08x40.c @@ -1322,9 +1322,6 @@ static int ov08x40_power_on(struct device *dev) @@ -1335,87 +1334,27 @@ index 83b49cf114ac..54575eea3c49 100644 return 0; } -@@ -1937,6 +1932,35 @@ static int ov08x40_stop_streaming(struct ov08x40 *ov08x) - OV08X40_REG_VALUE_08BIT, OV08X40_MODE_STANDBY); - } +@@ -1949,8 +1944,10 @@ static int ov08x40_identify_module(struct ov08x40 *ov08x) -+/* Verify chip ID */ -+static int ov08x40_identify_module(struct ov08x40 *ov08x) -+{ -+ struct i2c_client *client = v4l2_get_subdevdata(&ov08x->sd); -+ int ret; -+ u32 val; -+ -+ if (ov08x->identified) -+ return 0; -+ -+ ret = ov08x40_read_reg(ov08x, OV08X40_REG_CHIP_ID, -+ OV08X40_REG_VALUE_24BIT, &val); + ret = ov08x40_read_reg(ov08x, OV08X40_REG_CHIP_ID, + OV08X40_REG_VALUE_24BIT, &val); +- if (ret) + if (ret) { + dev_err(&client->dev, "error reading chip-id register: %d\n", ret); -+ return ret; + return ret; + } -+ -+ if (val != OV08X40_CHIP_ID) { -+ dev_err(&client->dev, "chip id mismatch: %x!=%x\n", -+ OV08X40_CHIP_ID, val); -+ return -ENXIO; -+ } -+ + + if (val != OV08X40_CHIP_ID) { + dev_err(&client->dev, "chip id mismatch: %x!=%x\n", +@@ -1958,6 +1955,7 @@ static int ov08x40_identify_module(struct ov08x40 *ov08x) + return -ENXIO; + } + + dev_dbg(&client->dev, "chip id 0x%x\n", val); -+ ov08x->identified = true; -+ -+ return 0; -+} -+ - static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable) - { - struct ov08x40 *ov08x = to_ov08x40(sd); -@@ -1950,6 +1974,10 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable) - if (ret < 0) - goto err_unlock; + ov08x->identified = true; -+ ret = ov08x40_identify_module(ov08x); -+ if (ret) -+ goto err_rpm_put; -+ - /* - * Apply default & customized values - * and then start streaming. -@@ -1974,32 +2002,6 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable) - return ret; - } - --/* Verify chip ID */ --static int ov08x40_identify_module(struct ov08x40 *ov08x) --{ -- struct i2c_client *client = v4l2_get_subdevdata(&ov08x->sd); -- int ret; -- u32 val; -- -- if (ov08x->identified) -- return 0; -- -- ret = ov08x40_read_reg(ov08x, OV08X40_REG_CHIP_ID, -- OV08X40_REG_VALUE_24BIT, &val); -- if (ret) -- return ret; -- -- if (val != OV08X40_CHIP_ID) { -- dev_err(&client->dev, "chip id mismatch: %x!=%x\n", -- OV08X40_CHIP_ID, val); -- return -ENXIO; -- } -- -- ov08x->identified = true; -- -- return 0; --} -- - static const struct v4l2_subdev_video_ops ov08x40_video_ops = { - .s_stream = ov08x40_set_stream, - }; -@@ -2151,65 +2153,69 @@ static int ov08x40_check_hwcfg(struct ov08x40 *ov08x, struct device *dev) + return 0; +@@ -2155,65 +2153,69 @@ static int ov08x40_check_hwcfg(struct ov08x40 *ov08x, struct device *dev) int ret; u32 xvclk_rate; @@ -1521,7 +1460,7 @@ index 83b49cf114ac..54575eea3c49 100644 ret = -EINVAL; goto out_err; } -@@ -2222,7 +2228,7 @@ static int ov08x40_check_hwcfg(struct ov08x40 *ov08x, struct device *dev) +@@ -2226,7 +2228,7 @@ static int ov08x40_check_hwcfg(struct ov08x40 *ov08x, struct device *dev) } if (j == bus_cfg.nr_of_link_frequencies) { @@ -1530,7 +1469,7 @@ index 83b49cf114ac..54575eea3c49 100644 link_freq_menu_items[i]); ret = -EINVAL; goto out_err; -@@ -2246,10 +2252,8 @@ static int ov08x40_probe(struct i2c_client *client) +@@ -2250,10 +2252,8 @@ static int ov08x40_probe(struct i2c_client *client) /* Check HW config */ ret = ov08x40_check_hwcfg(ov08x, &client->dev); @@ -1542,7 +1481,7 @@ index 83b49cf114ac..54575eea3c49 100644 /* Initialize subdev */ v4l2_i2c_subdev_init(&ov08x->sd, client, &ov08x40_subdev_ops); -@@ -2264,10 +2268,8 @@ static int ov08x40_probe(struct i2c_client *client) +@@ -2268,10 +2268,8 @@ static int ov08x40_probe(struct i2c_client *client) /* Check module identity */ ret = ov08x40_identify_module(ov08x); @@ -1554,70 +1493,6 @@ index 83b49cf114ac..54575eea3c49 100644 } /* Set default mode to max resolution */ -diff --git a/drivers/misc/mei/vsc-tp.c b/drivers/misc/mei/vsc-tp.c -index 7be1649b1972..fa553d4914b6 100644 ---- a/drivers/misc/mei/vsc-tp.c -+++ b/drivers/misc/mei/vsc-tp.c -@@ -36,20 +36,24 @@ - #define VSC_TP_XFER_TIMEOUT_BYTES 700 - #define VSC_TP_PACKET_PADDING_SIZE 1 - #define VSC_TP_PACKET_SIZE(pkt) \ -- (sizeof(struct vsc_tp_packet) + le16_to_cpu((pkt)->len) + VSC_TP_CRC_SIZE) -+ (sizeof(struct vsc_tp_packet_hdr) + le16_to_cpu((pkt)->hdr.len) + VSC_TP_CRC_SIZE) - #define VSC_TP_MAX_PACKET_SIZE \ -- (sizeof(struct vsc_tp_packet) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) -+ (sizeof(struct vsc_tp_packet_hdr) + VSC_TP_MAX_MSG_SIZE + VSC_TP_CRC_SIZE) - #define VSC_TP_MAX_XFER_SIZE \ - (VSC_TP_MAX_PACKET_SIZE + VSC_TP_XFER_TIMEOUT_BYTES) - #define VSC_TP_NEXT_XFER_LEN(len, offset) \ -- (len + sizeof(struct vsc_tp_packet) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) -+ (len + sizeof(struct vsc_tp_packet_hdr) + VSC_TP_CRC_SIZE - offset + VSC_TP_PACKET_PADDING_SIZE) - --struct vsc_tp_packet { -+struct vsc_tp_packet_hdr { - __u8 sync; - __u8 cmd; - __le16 len; - __le32 seq; -- __u8 buf[] __counted_by(len); -+}; -+ -+struct vsc_tp_packet { -+ struct vsc_tp_packet_hdr hdr; -+ __u8 buf[VSC_TP_MAX_XFER_SIZE - sizeof(struct vsc_tp_packet_hdr)]; - }; - - struct vsc_tp { -@@ -158,12 +162,12 @@ static int vsc_tp_dev_xfer(struct vsc_tp *tp, void *obuf, void *ibuf, size_t len - static int vsc_tp_xfer_helper(struct vsc_tp *tp, struct vsc_tp_packet *pkt, - void *ibuf, u16 ilen) - { -- int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet); -+ int ret, offset = 0, cpy_len, src_len, dst_len = sizeof(struct vsc_tp_packet_hdr); - int next_xfer_len = VSC_TP_PACKET_SIZE(pkt) + VSC_TP_XFER_TIMEOUT_BYTES; - u8 *src, *crc_src, *rx_buf = tp->rx_buf; - int count_down = VSC_TP_MAX_XFER_COUNT; - u32 recv_crc = 0, crc = ~0; -- struct vsc_tp_packet ack; -+ struct vsc_tp_packet_hdr ack; - u8 *dst = (u8 *)&ack; - bool synced = false; - -@@ -280,10 +284,10 @@ int vsc_tp_xfer(struct vsc_tp *tp, u8 cmd, const void *obuf, size_t olen, - - guard(mutex)(&tp->mutex); - -- pkt->sync = VSC_TP_PACKET_SYNC; -- pkt->cmd = cmd; -- pkt->len = cpu_to_le16(olen); -- pkt->seq = cpu_to_le32(++tp->seq); -+ pkt->hdr.sync = VSC_TP_PACKET_SYNC; -+ pkt->hdr.cmd = cmd; -+ pkt->hdr.len = cpu_to_le16(olen); -+ pkt->hdr.seq = cpu_to_le32(++tp->seq); - memcpy(pkt->buf, obuf, olen); - - crc = ~crc32(~0, (u8 *)pkt, sizeof(pkt) + olen); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 82b21e34c545..0cf24ba613a2 100644 --- a/drivers/pci/quirks.c diff --git a/sources b/sources index 51b5dac71..b9ec23f16 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.14.4.tar.xz) = f0c5a8639c40bb6319bce9c8439ecafabe540e3f0e27c9beda150124a425e01e2511127ece3f476ce2f1e94b8e2b175fb6a6a759551c4d872a80951023c0c478 -SHA512 (kernel-abi-stablelists-6.14.4.tar.xz) = 4435231d268f8b6b1f373551c01223848c4645a6f070ec74344e2b096c69ec47fa04347a66467599645bff10683d10252543290c5e006dc79b2c5f66e38b5a95 -SHA512 (kernel-kabi-dw-6.14.4.tar.xz) = 282d4b21832a4d21a5ca0022840fa6efbe2aeb23e6e13be91c7c0a5c946599ade939425e529a6f33e026c3bc73b8db261f9d942010977f5118e6645137a1604c +SHA512 (linux-6.14.5.tar.xz) = 2323678adddd75ba6c99e9ba35549048bfaddced2d41ad0c56b2ab64978bdd90632e9b789afc401d54594c9c574f838294c6ee470ff773b667eda797b60150b1 +SHA512 (kernel-abi-stablelists-6.14.5.tar.xz) = 14015e1985a51027e360b66799e71247e9272439c0f0b8d4028f11ecea57d1aba063de616169b40f2db49daeb23cbd242935bcaaa1042ab028674dcc0f3c1fbd +SHA512 (kernel-kabi-dw-6.14.5.tar.xz) = 0bd09f8d61e1be2d65915af1b47778b592b2a9906460e956c92487b3273eb44db264ab5db46b17284c7d5d66d14540620ae67a72c105ea11810316d5653c6707