diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-31 17:29:31 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-31 17:29:31 +0200 |
| commit | c4b406e4b845c14839146c32fbf7a8dec230874a (patch) | |
| tree | c5520e66eacd5b89d037bf42c99f4787fc25aa23 | |
| parent | 2f42ee8bccfa314c05f9d4138578470b579b2937 (diff) | |
| parent | c60b382a36f141d6c1f49f3ebe45a357a8c73e3a (diff) | |
| download | kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.tar.gz kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.tar.xz kernel-c4b406e4b845c14839146c32fbf7a8dec230874a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
26 files changed, 129 insertions, 17 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 92236dda5..ea5512351 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 = 12 +RHEL_RELEASE = 13 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 37bd4efe5..a8c7618a5 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/9b7bccf83a9f4bcfec141e14bc64737463ad4456 - 9b7bccf83a9f4bcfec141e14bc64737463ad4456 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/aa4ced52321898b847145fe2a34214b4398ad377 + aa4ced52321898b847145fe2a34214b4398ad377 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning "https://gitlab.com/cki-project/kernel-ark/-/commit"/8e648aae90c1d739b5ead43fb84c2cae550a8344 8e648aae90c1d739b5ead43fb84c2cae550a8344 Fix up rng merge diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index e11961530..2c2837286 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1083,6 +1083,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1091,6 +1092,8 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_LS1028A_PLLDIG=y CONFIG_CLK_PX30=y CONFIG_CLK_QORIQ=y @@ -1174,6 +1177,7 @@ CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set @@ -5522,6 +5526,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5875,6 +5880,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m CONFIG_RPMSG_QCOM_GLINK_RPM=m # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6645,6 +6651,7 @@ CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index ea01672b4..d933f701b 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -819,8 +819,10 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM_NS2=y CONFIG_CLK_BCM_SR=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -868,6 +870,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_SCMI=m CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 1583b3d10..f4329e1fe 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1083,6 +1083,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1091,6 +1092,8 @@ CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_CLK_IMX8QXP=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_LS1028A_PLLDIG=y CONFIG_CLK_PX30=y CONFIG_CLK_QORIQ=y @@ -1174,6 +1177,7 @@ CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set @@ -5497,6 +5501,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5850,6 +5855,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m CONFIG_RPMSG_QCOM_GLINK_RPM=m # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6620,6 +6626,7 @@ CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 720313de2..41878d1e6 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -819,8 +819,10 @@ CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM_NS2=y CONFIG_CLK_BCM_SR=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -868,6 +870,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_SCMI=m CONFIG_COMMON_CLK_SCPI=m # CONFIG_COMMON_CLK_SI514 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 2e6304ff3..3f77e0698 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1106,6 +1106,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1113,6 +1114,8 @@ CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI=y @@ -1183,6 +1186,7 @@ CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m @@ -5627,6 +5631,7 @@ CONFIG_PWRSEQ_SIMPLE=y CONFIG_PXA_DMA=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5978,6 +5983,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m CONFIG_RPMSG_QCOM_GLINK_RPM=m # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6772,6 +6778,7 @@ CONFIG_SMC=m CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP_ON_UP=y diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index cf8ac5743..fe7c6532f 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1106,6 +1106,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1113,6 +1114,8 @@ CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI=y @@ -1183,6 +1186,7 @@ CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m @@ -5603,6 +5607,7 @@ CONFIG_PWRSEQ_SIMPLE=y CONFIG_PXA_DMA=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5954,6 +5959,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m CONFIG_RPMSG_QCOM_GLINK_RPM=m # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6748,6 +6754,7 @@ CONFIG_SMC=m CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP_ON_UP=y diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index fb93f63e8..ae6a01e7b 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1081,6 +1081,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1088,6 +1089,8 @@ CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI=y @@ -1155,6 +1158,7 @@ CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m @@ -5495,6 +5499,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5809,6 +5814,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6583,6 +6589,7 @@ CONFIG_SMC=m CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP_ON_UP=y diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d93aa06c7..38c13ba36 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1081,6 +1081,7 @@ CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y CONFIG_CLK_BCM2711_DVP=m CONFIG_CLK_BCM2835=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set CONFIG_CLK_ICST=y CONFIG_CLK_IMX8MM=y @@ -1088,6 +1089,8 @@ CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y # CONFIG_CLK_IMX8ULP is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m CONFIG_CLK_PX30=y # CONFIG_CLK_QORIQ is not set CONFIG_CLK_RASPBERRYPI=y @@ -1155,6 +1158,7 @@ CONFIG_COMMON_CLK_PALMAS=m CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_RK808=y CONFIG_COMMON_CLK_ROCKCHIP=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set CONFIG_COMMON_CLK_S2MPS11=m CONFIG_COMMON_CLK_SCMI=y CONFIG_COMMON_CLK_SCPI=m @@ -5471,6 +5475,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=y # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set CONFIG_QCOM_A53PLL=m # CONFIG_QCOM_A7PLL is not set @@ -5785,6 +5790,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPMSG_CHAR=m +# CONFIG_RPMSG_CTRL is not set CONFIG_RPMSG=m # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -6559,6 +6565,7 @@ CONFIG_SMC=m CONFIG_SM_GCC_8250=m CONFIG_SM_GCC_8350=m # CONFIG_SM_GCC_8450 is not set +# CONFIG_SM_GPUCC_6350 is not set # CONFIG_SM_GPUCC_8150 is not set # CONFIG_SM_GPUCC_8250 is not set CONFIG_SMP_ON_UP=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index acbd04c8d..f60cc9545 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -859,8 +859,11 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set # CONFIG_CLK_SP810 is not set @@ -905,6 +908,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4704,6 +4708,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -4937,6 +4942,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5635,6 +5641,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y CONFIG_SMSC911X=m CONFIG_SMSC9420=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 77d8c9c15..c0259a5ea 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -699,8 +699,10 @@ CONFIG_CIFS_SMB_DIRECT=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -742,6 +744,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 11a48f548..834d49c62 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -858,8 +858,11 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set # CONFIG_CLK_SP810 is not set @@ -904,6 +907,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4679,6 +4683,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -4912,6 +4917,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5610,6 +5616,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y CONFIG_SMSC911X=m CONFIG_SMSC9420=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 2bb3bea27..9593ecc31 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -699,8 +699,10 @@ CONFIG_CIFS_SMB_DIRECT=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -742,6 +744,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index fa3676ca7..bb8d9106c 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -866,8 +866,11 @@ CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y # CONFIG_CIO_INJECT is not set CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set # CONFIG_CLK_SP810 is not set @@ -911,6 +914,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4637,6 +4641,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -4877,6 +4882,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5581,6 +5587,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y CONFIG_SMSC911X=m CONFIG_SMSC9420=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b043612f0..11f40e2c0 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -702,8 +702,10 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y # CONFIG_CIO_INJECT is not set CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -743,6 +745,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 1e941e665..72ef8c8d6 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -865,8 +865,11 @@ CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y # CONFIG_CIO_INJECT is not set CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set # CONFIG_CLK_SP810 is not set @@ -910,6 +913,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -4612,6 +4616,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -4852,6 +4857,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5556,6 +5562,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y CONFIG_SMSC911X=m CONFIG_SMSC9420=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 30a382fe2..32dea8baf 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -702,8 +702,10 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y # CONFIG_CIO_INJECT is not set CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -743,6 +745,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c0b35407e..4a03bd473 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -707,8 +707,10 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y # CONFIG_CIO_INJECT is not set CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -748,6 +750,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 460fe16cd..e3796dfca 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -913,8 +913,11 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_LGM_CGU is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set @@ -964,6 +967,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -5033,6 +5037,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -5275,6 +5280,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5990,6 +5996,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y # CONFIG_SMSC37B787_WDT is not set CONFIG_SMSC911X=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index baedf426d..09b465be8 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -725,8 +725,10 @@ CONFIG_CIFS_SMB_DIRECT=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -771,6 +773,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index d34cbbcf4..296be116d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -912,8 +912,11 @@ CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CIO2_BRIDGE=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +# CONFIG_CLK_IMX93 is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_LGM_CGU is not set # CONFIG_CLK_QORIQ is not set # CONFIG_CLK_RASPBERRYPI is not set @@ -963,6 +966,7 @@ CONFIG_COMMON_CLK_AXI_CLKGEN=m # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_MMP2_AUDIO is not set # CONFIG_COMMON_CLK_PWM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set @@ -5009,6 +5013,7 @@ CONFIG_PWRSEQ_SD8787=m CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCA7000_SPI is not set # CONFIG_QCA7000_UART is not set +# CONFIG_QCM_DISPCC_2290 is not set # CONFIG_QCM_GCC_2290 is not set # CONFIG_QCOM_A7PLL is not set # CONFIG_QCOM_ADM is not set @@ -5251,6 +5256,7 @@ CONFIG_ROMFS_FS=m CONFIG_ROSE=m CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPMSG_CHAR is not set +# CONFIG_RPMSG_CTRL is not set # CONFIG_RPMSG is not set # CONFIG_RPMSG_QCOM_GLINK_RPM is not set # CONFIG_RPMSG_QCOM_GLINK_SMEM is not set @@ -5966,6 +5972,7 @@ CONFIG_SMC_DIAG=m CONFIG_SMC=m # CONFIG_SM_DISPCC_8250 is not set # CONFIG_SM_FTL is not set +# CONFIG_SM_GPUCC_6350 is not set CONFIG_SMP=y # CONFIG_SMSC37B787_WDT is not set CONFIG_SMSC911X=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 28373001d..6d81e620c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -725,8 +725,10 @@ CONFIG_CIFS_SMB_DIRECT=y CONFIG_CIFS_UPCALL=y CONFIG_CIFS_XATTR=y CONFIG_CLEANCACHE=y +CONFIG_CLK_GATE_KUNIT_TEST=m # CONFIG_CLK_GFM_LPASS_SM8250 is not set # CONFIG_CLK_ICST is not set +CONFIG_CLK_KUNIT_TEST=m # CONFIG_CLK_QORIQ is not set CONFIG_CLK_SP810=y CONFIG_CLK_VEXPRESS_OSC=y @@ -771,6 +773,7 @@ CONFIG_COMMON_CLK_HI3798CV200=y # CONFIG_COMMON_CLK_MAX9485 is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_QCOM is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set # CONFIG_COMMON_CLK_SI514 is not set # CONFIG_COMMON_CLK_SI5341 is not set # CONFIG_COMMON_CLK_SI5351 is not set diff --git a/kernel.spec b/kernel.spec index e775392ec..adec1d167 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20220330gitd888c83fcec7.12 +%global distro_build 0.rc0.20220331git787af64d05cd.13 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc0.20220330gitd888c83fcec7.12 +%define pkgrelease 0.rc0.20220331git787af64d05cd.13 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220330gitd888c83fcec7.12%{?buildid}%{?dist} +%define specrelease 0.rc0.20220331git787af64d05cd.13%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-13034-gd888c83fcec7.tar.xz +Source0: linux-5.17-13430-g787af64d05cd.tar.xz Source1: Makefile.rhelver @@ -1392,8 +1392,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-13034-gd888c83fcec7 -c -mv linux-5.17-13034-gd888c83fcec7 linux-%{KVERREL} +%setup -q -n kernel-5.17-13430-g787af64d05cd -c +mv linux-5.17-13430-g787af64d05cd linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2252,7 +2252,7 @@ chmod +x tools/power/cpupower/utils/version-gen.sh %{tools_make} popd pushd tools/power/x86/intel-speed-select - %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS+="-lnl-genl-3 -lnl-3" + %{make} CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS="%{__global_ldflags} -lnl-genl-3 -lnl-3" popd %endif %endif @@ -2517,7 +2517,7 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %{tools_make} DESTDIR=%{buildroot} install popd pushd tools/power/x86/intel-speed-select - %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS+="-lnl-genl-3 -lnl-3" DESTDIR=%{buildroot} install + %{make} CFLAGS="${RPM_OPT_FLAGS} -D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" LDFLAGS="%{__global_ldflags} -lnl-genl-3 -lnl-3" DESTDIR=%{buildroot} install popd %endif pushd tools/thermal/tmon @@ -3024,7 +3024,8 @@ fi # # %changelog -* Wed Mar 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.d888c83fcec7.11] +* Thu Mar 31 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.787af64d05cd.12] +- redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) * Wed Mar 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.d888c83fcec7.10] diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index 29c98aac8..5eda5519d 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -2261,7 +2261,7 @@ index 419b5febc3ca..491323dfe4e0 100644 * * @perf_event_open: diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h -index 962b14d403e8..95ecd06fd858 100644 +index 962b14d403e8..8a89efe47571 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1398,11 +1398,9 @@ static inline unsigned long *section_to_usemap(struct mem_section *ms) @@ -2269,7 +2269,7 @@ index 962b14d403e8..95ecd06fd858 100644 { #ifdef CONFIG_SPARSEMEM_EXTREME - if (!mem_section) -+ if (!*mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)]) ++ if (!mem_section || !mem_section[SECTION_NR_TO_ROOT(nr)]) return NULL; #endif - if (!mem_section[SECTION_NR_TO_ROOT(nr)]) @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-13034-gd888c83fcec7.tar.xz) = 5dae1bd656da0bccac6ebeded09669993fef8625c697a1fddda2c20d80ac7823b6160dca064b6edd978bcc3c7c9a48c28f6c5f4c4ca5a96904254cd91fe83855 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220330gitd888c83fcec7.12.tar.bz2) = 119e43c486e35b543e6b6951d6b122be69c6905d45c3b9bd0d3361962f6cf0281422738d27eaf46afb227ca20eef17e5d5c4c16889dd7187b4913e80d7dd9375 -SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220330gitd888c83fcec7.12.tar.bz2) = c9cf51e3d9dececfead7e45221377b3077db81126f4cf891b20f9f316f3bf61595d876242a23a9b9f17e1d14b764d44bfb96e8e08f4ea48f4eef976092033d26 +SHA512 (linux-5.17-13430-g787af64d05cd.tar.xz) = 48ac8135c16ab084e5290391a002c1a89317b9392125e30b22033dd7e14b5e0dc83cbe4371801e37260574ee60d44da512577953a6d356d3494875fcbb3d949c +SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220331git787af64d05cd.13.tar.bz2) = 51cb93b1188044d39cdde03b063f934a7ec71474e79464d4a6d88946f8606f3ba5ee3b76afa624b3874384067790e0c08cdaa81bd38e3ec3890a8e8ebf259d30 +SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220331git787af64d05cd.13.tar.bz2) = 9faef4aaec8f60e2d6d6209aaf2773b9ddac705eca32da07837138ed008246df105120925fb8a37ab6ab90b8fe468fbcc4774628f4af639582398990bf9e4de1 |