rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

kernel-5.18.0-0.rc2.22

Browse Source 
* Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.22]
- 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 <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2022-04-11 08:52:24 -05:00
parent 035396c0df
commit 138d787153
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
26 changed files with 100 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 20 RHEL_RELEASE = 23
# #
# Early y+1 numbering # Early y+1 numbering

4
Patchlist.changelog
View File

@ -1,5 +1,5 @@
"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a94f8a8cd022b9156f1e992755e8061d20a28f3 "https://gitlab.com/cki-project/kernel-ark/-/commit"/6888ca0f9edde34646db3796af8c43aa0ecee9ab
9a94f8a8cd022b9156f1e992755e8061d20a28f3 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed 6888ca0f9edde34646db3796af8c43aa0ecee9ab tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed
"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae "https://gitlab.com/cki-project/kernel-ark/-/commit"/9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae
9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning 9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning

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

@ -5649,7 +5649,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y

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

@ -4438,7 +4438,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
@ -4553,7 +4553,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5979,13 +5979,13 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
# CONFIG_TCG_INFINEON is not set # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=m # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_I2C_NUVOTON=m
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_I2C is not set

2
kernel-aarch64-fedora.config
View File

@ -5624,7 +5624,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y

12
kernel-aarch64-rhel.config
View File

@ -4415,7 +4415,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
CONFIG_RANDOMIZE_MODULE_REGION_FULL=y CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
@ -4530,7 +4530,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5954,13 +5954,13 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
# CONFIG_TCG_INFINEON is not set # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=m # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_I2C_NUVOTON=m
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
# CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_I2C is not set

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

@ -5737,7 +5737,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

2
kernel-armv7hl-fedora.config
View File

@ -5713,7 +5713,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

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

@ -5585,7 +5585,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

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

@ -5561,7 +5561,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

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

@ -4769,7 +4769,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

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

@ -4229,7 +4229,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOM32_SELFTEST=y
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4341,7 +4341,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5748,14 +5748,14 @@ CONFIG_TASK_XACCT=y
# CONFIG_TCG_ATMEL is not set # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_IBMVTPM=y CONFIG_TCG_IBMVTPM=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=y # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=y # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=y CONFIG_TCG_TIS_I2C_NUVOTON=y
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
CONFIG_TCG_TPM=y CONFIG_TCG_TPM=y

2
kernel-ppc64le-fedora.config
View File

@ -4744,7 +4744,7 @@ CONFIG_RADIO_WL1273=m
# CONFIG_RAID6_PQ_BENCHMARK is not set # CONFIG_RAID6_PQ_BENCHMARK is not set
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

14
kernel-ppc64le-rhel.config
View File

@ -4210,7 +4210,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4322,7 +4322,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5727,14 +5727,14 @@ CONFIG_TASK_XACCT=y
# CONFIG_TCG_ATMEL is not set # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_IBMVTPM=y CONFIG_TCG_IBMVTPM=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=y # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=y # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=y CONFIG_TCG_TIS_I2C_NUVOTON=y
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
CONFIG_TCG_TPM=y CONFIG_TCG_TPM=y

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

@ -4708,7 +4708,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

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

@ -4172,7 +4172,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOM32_SELFTEST=y
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4283,7 +4283,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5691,10 +5691,10 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
# CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_INFINEON is not set

2
kernel-s390x-fedora.config
View File

@ -4683,7 +4683,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CHMAN=m

10
kernel-s390x-rhel.config
View File

@ -4153,7 +4153,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4264,7 +4264,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5670,10 +5670,10 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
# CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_INFINEON is not set

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

@ -4168,7 +4168,7 @@ CONFIG_RADIO_TEA575X=m
# CONFIG_RAID_ATTRS is not set # CONFIG_RAID_ATTRS is not set
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4279,7 +4279,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5695,10 +5695,10 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
# CONFIG_TASKSTATS is not set # CONFIG_TASKSTATS is not set
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
# CONFIG_TCG_TIS_I2C_ATMEL is not set # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
# CONFIG_TCG_TIS_I2C_INFINEON is not set # CONFIG_TCG_TIS_I2C_INFINEON is not set

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

@ -5099,7 +5099,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y

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

@ -4399,7 +4399,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
CONFIG_RANDOM32_SELFTEST=y CONFIG_RANDOM32_SELFTEST=y
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4510,7 +4510,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5932,16 +5932,16 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=m # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_I2C_NUVOTON=m
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
CONFIG_TCG_TPM=y CONFIG_TCG_TPM=y

2
kernel-x86_64-fedora.config
View File

@ -5075,7 +5075,7 @@ CONFIG_RADIO_WL1273=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y

16
kernel-x86_64-rhel.config
View File

@ -4377,7 +4377,7 @@ CONFIG_RADIO_TEA575X=m
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOMIZE_BASE=y
# CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y
CONFIG_RANDOMIZE_MEMORY=y CONFIG_RANDOMIZE_MEMORY=y
# CONFIG_RANDOM_TRUST_BOOTLOADER is not set # CONFIG_RANDOM_TRUST_BOOTLOADER is not set
CONFIG_RANDOM_TRUST_CPU=y CONFIG_RANDOM_TRUST_CPU=y
@ -4488,7 +4488,7 @@ CONFIG_RMI4_F11=y
CONFIG_RMI4_F12=y CONFIG_RMI4_F12=y
CONFIG_RMI4_F30=y CONFIG_RMI4_F30=y
CONFIG_RMI4_F34=y CONFIG_RMI4_F34=y
# CONFIG_RMI4_F3A is not set CONFIG_RMI4_F3A=y
# CONFIG_RMI4_F54 is not set # CONFIG_RMI4_F54 is not set
CONFIG_RMI4_F55=y CONFIG_RMI4_F55=y
CONFIG_RMI4_I2C=m CONFIG_RMI4_I2C=m
@ -5908,16 +5908,16 @@ CONFIG_TASK_DELAY_ACCT=y
CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TASKSTATS=y CONFIG_TASKSTATS=y
CONFIG_TASK_XACCT=y CONFIG_TASK_XACCT=y
CONFIG_TCG_ATMEL=m # CONFIG_TCG_ATMEL is not set
CONFIG_TCG_CRB=y CONFIG_TCG_CRB=y
CONFIG_TCG_INFINEON=m # CONFIG_TCG_INFINEON is not set
CONFIG_TCG_NSC=m # CONFIG_TCG_NSC is not set
CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_ATMEL is not set
CONFIG_TCG_TIS_I2C_CR50=m CONFIG_TCG_TIS_I2C_CR50=m
CONFIG_TCG_TIS_I2C_INFINEON=m # CONFIG_TCG_TIS_I2C_INFINEON is not set
CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_I2C_NUVOTON=m
# CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_SPI is not set
CONFIG_TCG_TIS_ST33ZP24_I2C=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set
# CONFIG_TCG_TIS_ST33ZP24_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set
CONFIG_TCG_TIS=y CONFIG_TCG_TIS=y
CONFIG_TCG_TPM=y CONFIG_TCG_TPM=y

23
kernel.spec
View File

@ -85,9 +85,9 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 0 to not build a separate debug kernel, but # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
# to build the base kernel using the debug configuration. (Specifying # to build the base kernel using the debug configuration. (Specifying
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 1
%global distro_build 0.rc1.20220408git1831fed559732b1.20 %global distro_build 0.rc2.23
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -132,13 +132,13 @@ Summary: The Linux kernel
%define rpmversion 5.18.0 %define rpmversion 5.18.0
%define patchversion 5.18 %define patchversion 5.18
%define pkgrelease 0.rc1.20220408git1831fed559732b1.20 %define pkgrelease 0.rc2.23
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 18 %define patchlevel 18
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc1.20220408git1831fed559732b1.20%{?buildid}%{?dist} %define specrelease 0.rc2.23%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
@ -698,7 +698,7 @@ BuildRequires: lld
# exact git commit you can run # exact git commit you can run
# #
# xzcat -qq ${TARBALL} | git get-tar-commit-id # xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.18-rc1-184-g1831fed559732b1.tar.xz Source0: linux-5.18-rc2.tar.xz
Source1: Makefile.rhelver Source1: Makefile.rhelver
@ -1390,8 +1390,8 @@ ApplyOptionalPatch()
fi fi
} }
%setup -q -n kernel-5.18-rc1-184-g1831fed559732b1 -c %setup -q -n kernel-5.18-rc2 -c
mv linux-5.18-rc1-184-g1831fed559732b1 linux-%{KVERREL} mv linux-5.18-rc2 linux-%{KVERREL}
cd linux-%{KVERREL} cd linux-%{KVERREL}
cp -a %{SOURCE1} . cp -a %{SOURCE1} .
@ -3025,9 +3025,16 @@ fi
# #
# #
%changelog %changelog
* Fri Apr 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.1831fed559732b1.19] * Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.22]
- tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski) - tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed (Herton R. Krzesinski)
* Mon Apr 11 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc2.21]
- redhat/configs: enable CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT (Joel Savitz) [2026319]
* Sat Apr 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.f1b45d8ccb9839b.19]
- configs: enable CONFIG_RMI4_F3A (Benjamin Tissoires)
- redhat: configs: Disable TPM 1.2 specific drivers (Jerry Snitselaar)
* Fri Apr 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.1831fed559732b1.18] * Fri Apr 08 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.1831fed559732b1.18]
- redhat/configs: Enable cr50 I2C TPM interface (Akihiko Odaki) - redhat/configs: Enable cr50 I2C TPM interface (Akihiko Odaki)
- spec: make HMAC file encode relative path (Jonathan Lebon) - spec: make HMAC file encode relative path (Jonathan Lebon)

46
patch-5.18-redhat.patch
View File

@ -52,7 +52,6 @@
include/linux/kernel.h | 21 + include/linux/kernel.h | 21 +
include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hook_defs.h | 2 +
include/linux/lsm_hooks.h | 6 + include/linux/lsm_hooks.h | 6 +
include/linux/mmzone.h | 11 +-
include/linux/module.h | 1 + include/linux/module.h | 1 +
include/linux/panic.h | 19 +- include/linux/panic.h | 19 +-
include/linux/pci.h | 16 + include/linux/pci.h | 16 +
@ -76,7 +75,7 @@
security/lockdown/lockdown.c | 1 + security/lockdown/lockdown.c | 1 +
security/security.c | 6 + security/security.c | 6 +
tools/power/x86/intel-speed-select/Makefile | 2 +- tools/power/x86/intel-speed-select/Makefile | 2 +-
78 files changed, 1771 insertions(+), 193 deletions(-) 77 files changed, 1764 insertions(+), 189 deletions(-)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3f1cc5e317ed..fbc0870dd787 100644 index 3f1cc5e317ed..fbc0870dd787 100644
@ -132,7 +131,7 @@ index 000000000000..effb81d04bfd
+ +
+endmenu +endmenu
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 8c7de9a72ea2..60632151a917 100644 index 29e273d3f8cc..f9fafd14f5de 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -549,10 +548,10 @@ index c68e694fca26..146cba5ae5bc 100644
return ctx.rc; return ctx.rc;
} }
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 9efbfe087de7..90f4595c8b3a 100644 index 762b61f67e6c..3581d4898dc4 100644
--- a/drivers/acpi/scan.c --- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c
@@ -1779,6 +1779,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1766,6 +1766,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
if (!acpi_match_device_ids(device, ignore_serial_bus_ids)) if (!acpi_match_device_ids(device, ignore_serial_bus_ids))
return false; return false;
@ -1938,7 +1937,7 @@ index 6a90e6e53d09..7e48c3bf701d 100644
PCI_ANY_ID, PCI_ANY_ID, }, PCI_ANY_ID, PCI_ANY_ID, },
{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC, {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 8bf72dbc33b7..d76794bfa0e0 100644 index db6793608447..24c16a1245a1 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c --- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance); @@ -149,6 +149,7 @@ megasas_set_ld_removed_by_fw(struct megasas_instance *instance);
@ -1970,10 +1969,10 @@ index 8bf72dbc33b7..d76794bfa0e0 100644
/* Fusion */ /* Fusion */
{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)}, {PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 00792767c620..2ee890521ed7 100644 index 7e476f50935b..c44e9bad52a1 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -12605,6 +12605,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev) @@ -12608,6 +12608,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
* The pci device ids are defined in mpi/mpi2_cnfg.h. * The pci device ids are defined in mpi/mpi2_cnfg.h.
*/ */
static const struct pci_device_id mpt3sas_pci_table[] = { static const struct pci_device_id mpt3sas_pci_table[] = {
@ -1981,7 +1980,7 @@ index 00792767c620..2ee890521ed7 100644
/* Spitfire ~ 2004 */ /* Spitfire ~ 2004 */
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004,
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
@@ -12623,6 +12624,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -12626,6 +12627,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
@ -1989,7 +1988,7 @@ index 00792767c620..2ee890521ed7 100644
/* Thunderbolt ~ 2208 */ /* Thunderbolt ~ 2208 */
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
@@ -12647,9 +12649,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = { @@ -12650,9 +12652,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1, { MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1,
PCI_ANY_ID, PCI_ANY_ID }, PCI_ANY_ID, PCI_ANY_ID },
@ -2278,31 +2277,6 @@ index 419b5febc3ca..491323dfe4e0 100644
* Security hooks for perf events * Security hooks for perf events
* *
* @perf_event_open: * @perf_event_open:
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 962b14d403e8..46ffab808f03 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1397,13 +1397,16 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms)
static inline struct mem_section *__nr_to_section(unsigned long nr)
{
+ unsigned long root = SECTION_NR_TO_ROOT(nr);
+
+ if (unlikely(root >= NR_SECTION_ROOTS))
+ return NULL;
+
#ifdef CONFIG_SPARSEMEM_EXTREME
- if (!mem_section)
+ if (!mem_section || !mem_section[root])
return NULL;
#endif
- if (!mem_section[SECTION_NR_TO_ROOT(nr)])
- return NULL;
- return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
+ return &mem_section[root][nr & SECTION_ROOT_MASK];
}
extern size_t mem_section_usage_size(void);
diff --git a/include/linux/module.h b/include/linux/module.h diff --git a/include/linux/module.h b/include/linux/module.h
index 1e135fd5c076..6ec4d001c1e2 100644 index 1e135fd5c076..6ec4d001c1e2 100644
--- a/include/linux/module.h --- a/include/linux/module.h
@ -2972,7 +2946,7 @@ index ddcbefe535e9..5061ef5ba38b 100644
default y default y
help help
diff --git a/kernel/Makefile b/kernel/Makefile diff --git a/kernel/Makefile b/kernel/Makefile
index 471d71935e90..bb93ae663f1e 100644 index 847a82bfe0e3..81f875f5370e 100644
--- a/kernel/Makefile --- a/kernel/Makefile
+++ b/kernel/Makefile +++ b/kernel/Makefile
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \ @@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.18-rc1-184-g1831fed559732b1.tar.xz) = 7a92c8d5c066e9d70580194eb5ebf10f532002c4044b9d1242d3023e6148fc39a234be52a0ba6996d3cc621d06e839f3d19013b01ff9fe98a9f2b2e2e0b5f1b1 SHA512 (linux-5.18-rc2.tar.xz) = e9772d0a7986f1f6dced5919b514ed5710471a398be6e9791830607ba34491ad56c01e8a3cb3bdca5fc0aed71eb4adc532c7adfb2c8776d00fb77a657c601470
SHA512 (kernel-abi-stablelists-5.18.0-0.rc1.20220408git1831fed559732b1.20.tar.bz2) = e22925df57ec20a01a71b2124f6f713ff5731a716f97bf2642de28172cc6633039d4b10380fdf89cd61143e9b9f95be37ec562b07f9658014f897a0592596010 SHA512 (kernel-abi-stablelists-5.18.0-0.rc2.23.tar.bz2) = 94288333b24554c1ecc07c20f30a97b37eae8b79c8f82182dea0552fcf6e30ffb37a422c80c7d749e5d9a1cf62afdd57953299780677ed231a018ee7ac3f3c82
SHA512 (kernel-kabi-dw-5.18.0-0.rc1.20220408git1831fed559732b1.20.tar.bz2) = ea1d9f150cb82f4c7e941e0bcc5487be2a0225fbaf4cd4b980666268cdd701a8a9d4c4f0ff785513e92f5f21393ac5904548ae6c8d655dc2ee2c19e7ebdcc8a5 SHA512 (kernel-kabi-dw-5.18.0-0.rc2.23.tar.bz2) = d0e054480dad43f4a79a999712aa1f034f2e28fd2516721d947c7275344bb560c6edf3fe1cde143e93eca85d56af5fd162e515271f0937fa7f7abf1735a54c53