From 035396c0dfd79bd93f98e67138f0a060335bbdf2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 8 Apr 2022 09:40:07 -0500 Subject: [PATCH] kernel-5.18.0-0.rc1.1831fed559732b1.19 * Fri Apr 08 2022 Fedora Kernel Team [5.18.0-0.rc1.1831fed559732b1.19] - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel-aarch64-debug-fedora.config | 3 ++- kernel-aarch64-debug-rhel.config | 5 ++-- kernel-aarch64-fedora.config | 3 ++- kernel-aarch64-rhel.config | 5 ++-- kernel-armv7hl-debug-fedora.config | 3 ++- kernel-armv7hl-fedora.config | 3 ++- kernel-armv7hl-lpae-debug-fedora.config | 3 ++- kernel-armv7hl-lpae-fedora.config | 3 ++- kernel-ppc64le-debug-fedora.config | 3 ++- kernel-ppc64le-debug-rhel.config | 5 ++-- kernel-ppc64le-fedora.config | 3 ++- kernel-ppc64le-rhel.config | 5 ++-- kernel-s390x-debug-fedora.config | 3 ++- kernel-s390x-debug-rhel.config | 6 ++--- kernel-s390x-fedora.config | 3 ++- kernel-s390x-rhel.config | 6 ++--- kernel-s390x-zfcpdump-rhel.config | 6 ++--- kernel-x86_64-debug-fedora.config | 9 +++---- kernel-x86_64-debug-rhel.config | 11 ++++----- kernel-x86_64-fedora.config | 9 +++---- kernel-x86_64-rhel.config | 11 ++++----- kernel.spec | 31 ++++++++++++++++++------- patch-5.18-redhat.patch | 10 ++++---- sources | 6 ++--- 26 files changed, 90 insertions(+), 71 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7f02eb68b..48e74c801 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 19 +RHEL_RELEASE = 20 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 5d382edfc..87704bbcd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9e0d609a1538c26606fe04613e8ce3a4244ff3c2 - 9e0d609a1538c26606fe04613e8ce3a4244ff3c2 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a94f8a8cd022b9156f1e992755e8061d20a28f3 + 9a94f8a8cd022b9156f1e992755e8061d20a28f3 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed "https://gitlab.com/cki-project/kernel-ark/-/commit"/9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae 9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 724a95c85..12082fb65 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6080,6 +6080,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7529,7 +7530,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index b4148e1d9..7ba5cd729 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1603,7 +1603,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1731,7 +1730,7 @@ CONFIG_FONT_SUPPORT=y CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5985,7 +5984,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b651be391..bdf408dcc 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6055,6 +6055,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7502,7 +7503,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ec00a71b9..a7bb06700 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1595,7 +1595,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1715,7 +1714,7 @@ CONFIG_FONT_SUPPORT=y CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5960,7 +5959,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 859083784..268279a46 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6198,6 +6198,7 @@ CONFIG_SATA_AHCI=y CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7717,7 +7718,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 70fb6a6cd..71178042c 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6174,6 +6174,7 @@ CONFIG_SATA_AHCI=y CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7691,7 +7692,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index d540e8c01..47572da8e 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6020,6 +6020,7 @@ CONFIG_SATA_AHCI=y CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7485,7 +7486,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 8724e2668..198b64af0 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5996,6 +5996,7 @@ CONFIG_SATA_AHCI=y CONFIG_SATA_HIGHBANK=m # CONFIG_SATA_INIC162X is not set CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m # CONFIG_SATA_NV is not set CONFIG_SATA_PMP=y @@ -7459,7 +7460,7 @@ CONFIG_TCG_FTPM_TEE=m # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index f8d3d8b41..d99dc88de 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5125,6 +5125,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6437,7 +6438,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 3258993a5..f12bb825d 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1440,7 +1440,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1571,7 +1570,7 @@ CONFIG_FONT_SUPPORT=y CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5752,7 +5751,7 @@ CONFIG_TCG_IBMVTPM=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=y -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_TCG_TIS_I2C_NUVOTON=y # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f2acf8ea2..6506e5e1b 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5100,6 +5100,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6410,7 +6411,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 870a97cb6..d71a77356 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1432,7 +1432,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1555,7 +1554,7 @@ CONFIG_FONT_SUPPORT=y CONFIG_FORCE_MAX_ZONEORDER=9 CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5731,7 +5730,7 @@ CONFIG_TCG_IBMVTPM=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=y -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=y CONFIG_TCG_TIS_I2C_NUVOTON=y # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 985da8e35..6afab145d 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5071,6 +5071,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6380,7 +6381,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e9bd274d7..8af56f74f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1446,7 +1446,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y -# CONFIG_EXPOLINE_EXTERN is not set +CONFIG_EXPOLINE_EXTERN=y # CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y @@ -1575,7 +1575,7 @@ CONFIG_FM10K=m CONFIG_FONT_SUPPORT=m CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5696,7 +5696,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e7c79f6ca..4a8df2f77 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5046,6 +5046,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6353,7 +6354,7 @@ CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index b4932f4d2..f31a9342a 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1438,7 +1438,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y -# CONFIG_EXPOLINE_EXTERN is not set +CONFIG_EXPOLINE_EXTERN=y # CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y @@ -1559,7 +1559,7 @@ CONFIG_FM10K=m CONFIG_FONT_SUPPORT=m CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5675,7 +5675,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1aa24204b..cad916190 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1444,7 +1444,7 @@ CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" # CONFIG_EXFAT_FS is not set # CONFIG_EXPERT is not set CONFIG_EXPOLINE_AUTO=y -# CONFIG_EXPOLINE_EXTERN is not set +CONFIG_EXPOLINE_EXTERN=y # CONFIG_EXPOLINE_FULL is not set # CONFIG_EXPOLINE_OFF is not set CONFIG_EXPOLINE=y @@ -1565,7 +1565,7 @@ CONFIG_FM10K=m CONFIG_FONT_SUPPORT=m CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5700,7 +5700,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m # CONFIG_TCG_TIS_I2C_ATMEL is not set -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m # CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_NUVOTON is not set # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6ee186e73..cdd29fd88 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5462,6 +5462,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6224,7 +6225,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -# CONFIG_SND_SOC_CS35L41_I2C is not set +CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set @@ -6282,7 +6283,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_SGTL5000 is not set # CONFIG_SND_SOC_IMX_SPDIF is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_INTEL_AVS is not set +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m @@ -6325,7 +6326,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_INTEL_SST=m @@ -6810,7 +6811,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 65b95fbe0..232bc237f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1548,7 +1548,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1676,7 +1675,7 @@ CONFIG_FM10K=m CONFIG_FONT_SUPPORT=y CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5389,7 +5388,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_CS35L34 is not set # CONFIG_SND_SOC_CS35L35 is not set # CONFIG_SND_SOC_CS35L36 is not set -# CONFIG_SND_SOC_CS35L41_I2C is not set +CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m # CONFIG_SND_SOC_CS4234 is not set # CONFIG_SND_SOC_CS4265 is not set @@ -5447,7 +5446,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m # CONFIG_SND_SOC_IMX_SGTL5000 is not set # CONFIG_SND_SOC_IMX_SPDIF is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_INTEL_AVS is not set +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m @@ -5490,7 +5489,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_INTEL_SST=m @@ -5938,7 +5937,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index f2db987a3..ad57503f3 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5438,6 +5438,7 @@ CONFIG_SATA_AHCI=y # CONFIG_SATA_HIGHBANK is not set CONFIG_SATA_INIC162X=m CONFIG_SATA_LPM_POLICY=3 +CONFIG_SATA_MOBILE_LPM_POLICY=0 CONFIG_SATA_MV=m CONFIG_SATA_NV=m CONFIG_SATA_PMP=y @@ -6199,7 +6200,7 @@ CONFIG_SND_SOC_CROS_EC_CODEC=m CONFIG_SND_SOC_CS35L34=m CONFIG_SND_SOC_CS35L35=m CONFIG_SND_SOC_CS35L36=m -# CONFIG_SND_SOC_CS35L41_I2C is not set +CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m CONFIG_SND_SOC_CS4234=m # CONFIG_SND_SOC_CS4265 is not set @@ -6257,7 +6258,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_SGTL5000 is not set # CONFIG_SND_SOC_IMX_SPDIF is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_INTEL_AVS is not set +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m @@ -6300,7 +6301,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_INTEL_SST=m @@ -6784,7 +6785,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index dad110b57..bf654ad48 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1540,7 +1540,6 @@ CONFIG_EVM=y CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" CONFIG_EXFAT_FS=m # CONFIG_EXPERT is not set -# CONFIG_EXPOLINE_EXTERN is not set CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -1660,7 +1659,7 @@ CONFIG_FM10K=m CONFIG_FONT_SUPPORT=y CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set -# CONFIG_FPROBE is not set +CONFIG_FPROBE=y # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set @@ -5366,7 +5365,7 @@ CONFIG_SND_SOC_AMD_YC_MACH=m # CONFIG_SND_SOC_CS35L34 is not set # CONFIG_SND_SOC_CS35L35 is not set # CONFIG_SND_SOC_CS35L36 is not set -# CONFIG_SND_SOC_CS35L41_I2C is not set +CONFIG_SND_SOC_CS35L41_I2C=m CONFIG_SND_SOC_CS35L41_SPI=m # CONFIG_SND_SOC_CS4234 is not set # CONFIG_SND_SOC_CS4265 is not set @@ -5424,7 +5423,7 @@ CONFIG_SND_SOC_HDAC_HDMI=m # CONFIG_SND_SOC_IMX_SGTL5000 is not set # CONFIG_SND_SOC_IMX_SPDIF is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC_INTEL_AVS is not set +CONFIG_SND_SOC_INTEL_AVS=m CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m @@ -5467,7 +5466,7 @@ CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH=m CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m -# CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH is not set +CONFIG_SND_SOC_INTEL_SOF_SSP_AMP_MACH=m CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m CONFIG_SND_SOC_INTEL_SST=m @@ -5914,7 +5913,7 @@ CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_TCG_TIS_I2C_ATMEL=m -# CONFIG_TCG_TIS_I2C_CR50 is not set +CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_INFINEON=m CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_SPI is not set diff --git a/kernel.spec b/kernel.spec index e9e38eae2..dc82ebf54 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc1.20220406git3e732ebf7316ac8.19 +%global distro_build 0.rc1.20220408git1831fed559732b1.20 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc1.20220406git3e732ebf7316ac8.19 +%define pkgrelease 0.rc1.20220408git1831fed559732b1.20 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20220406git3e732ebf7316ac8.19%{?buildid}%{?dist} +%define specrelease 0.rc1.20220408git1831fed559732b1.20%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -698,7 +698,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc1-16-g3e732ebf7316ac8.tar.xz +Source0: linux-5.18-rc1-184-g1831fed559732b1.tar.xz Source1: Makefile.rhelver @@ -1032,7 +1032,7 @@ This package provides debug information for package kernel-tools. # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|XXX' -o kernel-tools-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o kernel-tools-debuginfo.list} # with_tools %endif @@ -1390,8 +1390,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc1-16-g3e732ebf7316ac8 -c -mv linux-5.18-rc1-16-g3e732ebf7316ac8 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc1-184-g1831fed559732b1 -c +mv linux-5.18-rc1-184-g1831fed559732b1 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1708,7 +1708,7 @@ BuildKernel() { # hmac sign the kernel for FIPS echo "Creating hmac file: $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac" ls -l $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer - sha512hmac $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer | sed -e "s,$RPM_BUILD_ROOT,," > $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac; + (cd $RPM_BUILD_ROOT/%{image_install_path} && sha512hmac $InstallName-$KernelVer) > $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac; cp $RPM_BUILD_ROOT/%{image_install_path}/.vmlinuz-$KernelVer.hmac $RPM_BUILD_ROOT/lib/modules/$KernelVer/.vmlinuz.hmac if [ $DoModules -eq 1 ]; then @@ -2248,6 +2248,9 @@ chmod +x tools/power/cpupower/utils/version-gen.sh pushd tools/power/x86/intel-speed-select %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" popd + pushd tools/arch/x86/intel_sdsi + %{make} + popd %endif %endif pushd tools/thermal/tmon/ @@ -2513,6 +2516,9 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower pushd tools/power/x86/intel-speed-select %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" DESTDIR=%{buildroot} install popd + pushd tools/arch/x86/intel_sdsi + %{tools_make} DESTDIR=%{buildroot} install + popd %endif pushd tools/thermal/tmon %{tools_make} INSTALL_ROOT=%{buildroot} install @@ -2851,6 +2857,7 @@ fi %{_bindir}/turbostat %{_mandir}/man8/turbostat* %{_bindir}/intel-speed-select +%{_sbindir}/intel_sdsi %endif # cpupowerarchs %endif @@ -3018,9 +3025,15 @@ fi # # %changelog -* Wed Apr 06 2022 Fedora Kernel Team [5.18.0-0.rc1.3e732ebf7316ac8.18] +* Fri Apr 08 2022 Fedora Kernel Team [5.18.0-0.rc1.1831fed559732b1.19] - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) +* Fri Apr 08 2022 Fedora Kernel Team [5.18.0-0.rc1.1831fed559732b1.18] +- redhat/configs: Enable cr50 I2C TPM interface (Akihiko Odaki) +- spec: make HMAC file encode relative path (Jonathan Lebon) +- redhat/kernel.spec.template: Add intel_sdsi utility (Prarit Bhargava) +- Spec fixes for intel-speed-select (Justin M. Forbes) + * Wed Apr 06 2022 Fedora Kernel Team [5.18.0-0.rc1.3e732ebf7316ac8.17] - Add Partner Supported taint flag to kAFS (Alice Mitchell) [2038999] - Add Partner Supported taint flag (Alice Mitchell) [2038999] diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 0cb5c9a8b..7ba4d3555 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -659,7 +659,7 @@ index c59265146e9c..caa8458edde2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index 1d8242969751..ce626cbe3390 100644 +index e15063d61460..5a488694308a 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -52,6 +52,7 @@ @@ -756,7 +756,7 @@ index 1d8242969751..ce626cbe3390 100644 /* * Batched entropy returns random integers. The quality of the random * number is good as /dev/urandom. In order to ensure that the randomness -@@ -1179,6 +1245,19 @@ void add_bootloader_randomness(const void *buf, size_t size) +@@ -1176,6 +1242,19 @@ void add_bootloader_randomness(const void *buf, size_t size) } EXPORT_SYMBOL_GPL(add_bootloader_randomness); @@ -776,7 +776,7 @@ index 1d8242969751..ce626cbe3390 100644 #if IS_ENABLED(CONFIG_VMGENID) static BLOCKING_NOTIFIER_HEAD(vmfork_chain); -@@ -1466,6 +1545,9 @@ static void try_to_generate_entropy(void) +@@ -1463,6 +1542,9 @@ static void try_to_generate_entropy(void) SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, flags) { @@ -786,7 +786,7 @@ index 1d8242969751..ce626cbe3390 100644 if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) return -EINVAL; -@@ -1479,6 +1561,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, +@@ -1476,6 +1558,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, if (count > INT_MAX) count = INT_MAX; @@ -805,7 +805,7 @@ index 1d8242969751..ce626cbe3390 100644 if (!(flags & GRND_INSECURE) && !crng_ready()) { int ret; -@@ -1632,6 +1726,7 @@ static int random_fasync(int fd, struct file *filp, int on) +@@ -1636,6 +1730,7 @@ static int random_fasync(int fd, struct file *filp, int on) } const struct file_operations random_fops = { diff --git a/sources b/sources index 6a16213f3..9a3a6b484 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc1-16-g3e732ebf7316ac8.tar.xz) = 4a7e991fbcc80832d0e05eb0ae1dad514e542c74b8a32c059e9c215f736a46b12d101ba578bd2014135eaee57a9dc807d667bc9975584817f9655cb91aa861b1 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc1.20220406git3e732ebf7316ac8.19.tar.bz2) = 71de10f2fd9e25ccdb7942357d6129f972067c254a688e0b9b08d24bd46d00d08a0c4db9ccd9d0bb73ed7fb5b9463bfbf93ecdce20a61ddfa165014564edc0a7 -SHA512 (kernel-kabi-dw-5.18.0-0.rc1.20220406git3e732ebf7316ac8.19.tar.bz2) = aa551e25333ed0cf4ff9f016ec3bb3fd7be8ca2627bd06a481092aef0e1817692080aa0555efc85cb96307da0c8ffc291e8d337e50c8ad87233884af6163cae5 +SHA512 (linux-5.18-rc1-184-g1831fed559732b1.tar.xz) = 7a92c8d5c066e9d70580194eb5ebf10f532002c4044b9d1242d3023e6148fc39a234be52a0ba6996d3cc621d06e839f3d19013b01ff9fe98a9f2b2e2e0b5f1b1 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc1.20220408git1831fed559732b1.20.tar.bz2) = e22925df57ec20a01a71b2124f6f713ff5731a716f97bf2642de28172cc6633039d4b10380fdf89cd61143e9b9f95be37ec562b07f9658014f897a0592596010 +SHA512 (kernel-kabi-dw-5.18.0-0.rc1.20220408git1831fed559732b1.20.tar.bz2) = ea1d9f150cb82f4c7e941e0bcc5487be2a0225fbaf4cd4b980666268cdd701a8a9d4c4f0ff785513e92f5f21393ac5904548ae6c8d655dc2ee2c19e7ebdcc8a5