diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-04 16:43:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-04 16:43:26 +0200 |
| commit | 2be08941cfbd35c49339ed10a5dd1e4af0037139 (patch) | |
| tree | 98ee336e7e9ca6a4c3dda87fadefdc2b70973a66 | |
| parent | 29e246910e6d0901ca530e87e3db96185e397c8e (diff) | |
| parent | d86cbb69b2901c173dfc4ed24e9fe5da818de435 (diff) | |
| download | kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.tar.gz kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.tar.xz kernel-2be08941cfbd35c49339ed10a5dd1e4af0037139.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc1.18.vanilla.1.fc37kernel-5.18.0-0.rc1.18.vanilla.1.fc36kernel-5.18.0-0.rc1.18.vanilla.1.fc35kernel-5.18.0-0.rc1.18.vanilla.1.fc34
27 files changed, 93 insertions, 44 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 6d793df57..7399f9684 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 = 15 +RHEL_RELEASE = 18 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 54ff5e6a0..79369e668 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/0355e4885dfcc26b3691fa04c0072cfabd5beb5f - 0355e4885dfcc26b3691fa04c0072cfabd5beb5f mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae + 9a4f5172b1f7ca55a805fca7cd025b9a1f8c1eae 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 681346694..724a95c85 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5981,6 +5981,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set # CONFIG_RTC_DRV_MXC_V2 is not set +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -7439,6 +7440,7 @@ CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y CONFIG_SUN50I_IOMMU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y # CONFIG_SUN8I_A83T_CCU is not set CONFIG_SUN8I_DE2_CCU=y CONFIG_SUN8I_H3_CCU=y @@ -7748,6 +7750,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 15d2e2601..b4148e1d9 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4459,8 +4459,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -6182,6 +6182,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index e6620402a..b651be391 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -5956,6 +5956,7 @@ CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set # CONFIG_RTC_DRV_MXC_V2 is not set +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -7412,6 +7413,7 @@ CONFIG_SUN50I_H6_CCU=y CONFIG_SUN50I_H6_R_CCU=y CONFIG_SUN50I_IOMMU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y # CONFIG_SUN8I_A83T_CCU is not set CONFIG_SUN8I_DE2_CCU=y CONFIG_SUN8I_H3_CCU=y @@ -7721,6 +7723,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 00739ffee..ec00a71b9 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4436,8 +4436,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -6157,6 +6157,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 4db739a18..ddc105148 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6091,6 +6091,7 @@ CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set CONFIG_RTC_DRV_MXC_V2=m CONFIG_RTC_DRV_OMAP=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m @@ -7624,6 +7625,7 @@ CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_A83T_CCU=y @@ -7947,6 +7949,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index afa251e7e..6736d20c8 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6067,6 +6067,7 @@ CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set CONFIG_RTC_DRV_MXC_V2=m CONFIG_RTC_DRV_OMAP=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m @@ -7598,6 +7599,7 @@ CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_A83T_CCU=y @@ -7921,6 +7923,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set CONFIG_TOUCHSCREEN_IMX6UL_TSC=m # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 2246a86bf..3172e12da 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -5916,6 +5916,7 @@ CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set # CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_OMAP=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m @@ -7392,6 +7393,7 @@ CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_A83T_CCU=y @@ -7715,6 +7717,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index a7c39c4ce..f0ca465a1 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -5892,6 +5892,7 @@ CONFIG_RTC_DRV_MV=m # CONFIG_RTC_DRV_MXC is not set # CONFIG_RTC_DRV_MXC_V2 is not set CONFIG_RTC_DRV_OMAP=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m @@ -7366,6 +7367,7 @@ CONFIG_SUN4I_GPADC=m CONFIG_SUN5I_CCU=y CONFIG_SUN6I_A31_CCU=y CONFIG_SUN6I_MSGBOX=y +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUN8I_A23_CCU=y CONFIG_SUN8I_A33_CCU=y CONFIG_SUN8I_A83T_CCU=y @@ -7689,6 +7691,7 @@ CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 8ce1c11ad..f8d3d8b41 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5033,6 +5033,7 @@ CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_OPAL=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6359,6 +6360,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6629,6 +6631,7 @@ CONFIG_TOUCHSCREEN_ELAN=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 929c1cd92..3258993a5 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4249,8 +4249,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -5939,6 +5939,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index c208e0f33..f2acf8ea2 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5008,6 +5008,7 @@ CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_OPAL=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6332,6 +6333,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6602,6 +6604,7 @@ CONFIG_TOUCHSCREEN_ELAN=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 32ae2c67b..870a97cb6 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4230,8 +4230,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -5918,6 +5918,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 4159ee543..985da8e35 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4969,6 +4969,7 @@ CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6303,6 +6304,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6578,6 +6580,7 @@ CONFIG_TOUCHSCREEN_ELAN=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index c95b90a47..e9bd274d7 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4191,8 +4191,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -5888,6 +5888,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 24eba8518..e7c79f6ca 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4944,6 +4944,7 @@ CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6276,6 +6277,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6551,6 +6553,7 @@ CONFIG_TOUCHSCREEN_ELAN=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index f5d8605f0..b4932f4d2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4172,8 +4172,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -5867,6 +5867,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 5e48b7079..1aa24204b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5892,6 +5892,7 @@ CONFIG_TN3270=y # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index d57016521..6ee186e73 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5368,6 +5368,7 @@ CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6732,6 +6733,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -7013,6 +7015,7 @@ CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 6570544b3..65b95fbe0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4419,8 +4419,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -6135,6 +6135,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 09a76e442..408ac6e18 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5344,6 +5344,7 @@ CONFIG_RTC_DRV_MAX6902=m CONFIG_RTC_DRV_MAX6916=m CONFIG_RTC_DRV_MCP795=m CONFIG_RTC_DRV_MSM6242=m +# CONFIG_RTC_DRV_OPTEE is not set CONFIG_RTC_DRV_PCF2123=m CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF85063=m @@ -6706,6 +6707,7 @@ CONFIG_ST_UVIS25=m CONFIG_ST_UVIS25_SPI=m # CONFIG_SUN50I_DE2_BUS is not set # CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN6I_RTC_CCU=y CONFIG_SUNDANCE=m # CONFIG_SUNDANCE_MMIO is not set CONFIG_SUNGEM=m @@ -6987,6 +6989,7 @@ CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_HYCON_HY46XX=m CONFIG_TOUCHSCREEN_ILI210X=m CONFIG_TOUCHSCREEN_ILITEK=m +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set CONFIG_TOUCHSCREEN_INEXIO=m CONFIG_TOUCHSCREEN_IQS5XX=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 8a0a9eef3..dad110b57 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4397,8 +4397,8 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set CONFIG_RCU_NOCB_CPU=y -# CONFIG_RCU_REF_SCALE_TEST is not set -# CONFIG_RCU_SCALE_TEST is not set +CONFIG_RCU_REF_SCALE_TEST=m +CONFIG_RCU_SCALE_TEST=m CONFIG_RCU_TORTURE_TEST=m # CONFIG_RCU_TRACE is not set # CONFIG_RC_XBOX_DVD is not set @@ -6111,6 +6111,7 @@ CONFIG_TOUCHSCREEN_ELO=m # CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set # CONFIG_TOUCHSCREEN_ILITEK is not set +# CONFIG_TOUCHSCREEN_IMAGIS is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set diff --git a/kernel.spec b/kernel.spec index f925e58b7..6861e7882 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.20220401gite8b767f5e04097a.15 +%global distro_build 0.rc1.18 %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.20220401gite8b767f5e04097a.15 +%define pkgrelease 0.rc1.18 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220401gite8b767f5e04097a.15%{?buildid}%{?dist} +%define specrelease 0.rc1.18%{?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-13673-ge8b767f5e04097a.tar.xz +Source0: linux-5.18-rc1.tar.xz Source1: Makefile.rhelver @@ -1392,8 +1392,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-13673-ge8b767f5e04097a -c -mv linux-5.17-13673-ge8b767f5e04097a linux-%{KVERREL} +%setup -q -n kernel-5.18-rc1 -c +mv linux-5.18-rc1 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3024,9 +3024,12 @@ fi # # %changelog -* Fri Apr 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.e8b767f5e04097a.14] +* Mon Apr 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.17] - redhat/kernel.spec.template: Fix intel-speed-select compile (Prarit Bhargava) + +* Mon Apr 04 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc1.16] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +- redhat/configs: Enable CONFIG_RCU_SCALE_TEST & CONFIG_RCU_REF_SCALE_TEST (Waiman Long) * Fri Apr 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.e8b767f5e04097a.13] - Add clk_test and clk-gate_test to mod-internal.list (Justin M. Forbes) diff --git a/mod-internal.list b/mod-internal.list index c1b56a123..b2e639887 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -45,6 +45,7 @@ test_klp_state2 test_klp_state3 torture refscale +rcuscale memcpy_kunit dev_addr_lists_test test_hash diff --git a/patch-5.18-redhat.patch b/patch-5.18-redhat.patch index b9fa16e5d..55b43ee0a 100644 --- a/patch-5.18-redhat.patch +++ b/patch-5.18-redhat.patch @@ -130,7 +130,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 18ecb49f1af6..8e964bc4843e 100644 +index 8c7de9a72ea2..60632151a917 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -144,7 +144,7 @@ index 18ecb49f1af6..8e964bc4843e 100644 # We are using a recursive build, so we need to do a little thinking # to get the ordering right. # -@@ -1242,7 +1246,13 @@ define filechk_version.h +@@ -1238,7 +1242,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -225,7 +225,7 @@ index 3f8ee257f9aa..3ab92feb6241 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index 28ae7df26c4a..8f5ea21872ff 100644 +index 1cc85b8ff42e..b7ee128c67ce 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -2216,3 +2216,8 @@ int ipl_report_free(struct ipl_report *report) @@ -238,7 +238,7 @@ index 28ae7df26c4a..8f5ea21872ff 100644 + return !!ipl_secure_flag; +} diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 84e23fcc1106..a6ec5247aa18 100644 +index d860ac300919..6e63924932e6 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -49,6 +49,7 @@ @@ -249,7 +249,7 @@ index 84e23fcc1106..a6ec5247aa18 100644 #include <linux/hugetlb.h> #include <linux/kmemleak.h> -@@ -964,6 +965,9 @@ void __init setup_arch(char **cmdline_p) +@@ -965,6 +966,9 @@ void __init setup_arch(char **cmdline_p) log_component_list(); @@ -1524,7 +1524,7 @@ index ee4da9ab8013..0f217997a764 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 677fa4bf76d3..71d5d773d3d8 100644 +index efb85c6d8e2d..e30c7cc199db 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -240,6 +240,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1591,7 +1591,7 @@ index 677fa4bf76d3..71d5d773d3d8 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 1b31f19e1053..4ffdabb4f223 100644 +index d464fdf978fb..acdaab3d7697 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -80,14 +80,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -1627,7 +1627,7 @@ index 1b31f19e1053..4ffdabb4f223 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -847,8 +853,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -869,8 +875,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ @@ -1638,10 +1638,10 @@ index 1b31f19e1053..4ffdabb4f223 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index f4b674a8ce20..181cbac05cef 100644 +index 1393bbf82d71..493a30d3493a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -776,6 +776,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -795,6 +795,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1649,7 +1649,7 @@ index f4b674a8ce20..181cbac05cef 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -811,6 +812,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -831,6 +832,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } @@ -2116,10 +2116,10 @@ index 81749eaddf4c..f5de0c0c14cd 100644 if (ext4_has_feature_encrypt(sb) && es->s_encryption_level) { diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c -index d84714e4e46a..689297b7b003 100644 +index 54be9d64093e..20fe244067ec 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c -@@ -1602,9 +1602,14 @@ xfs_fs_fill_super( +@@ -1603,9 +1603,14 @@ xfs_fs_fill_super( sb->s_flags |= SB_I_VERSION; if (xfs_has_dax_always(mp)) { @@ -2328,7 +2328,7 @@ index f5844908a089..901d51012738 100644 struct taint_flag { diff --git a/include/linux/pci.h b/include/linux/pci.h -index b957eeb89c7a..16c883f374aa 100644 +index 60adf42460ab..a3f0f828a346 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1491,6 +1491,22 @@ int pci_add_dynid(struct pci_driver *drv, @@ -3297,7 +3297,7 @@ index eaa4b5c920a2..27563a5fedcd 100644 count, align); diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index d10f93aac1c8..253455a77e19 100644 +index ed9d056d2108..8388e2a804d3 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -21,6 +21,7 @@ @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-13673-ge8b767f5e04097a.tar.xz) = f58596518cf31665cce79c81eb8bf54cd3f01990c4a4bf0a68605daa319e250eec241a459aaae68e9a6d82a81f7cdab908d7a4e841b32ac7281834e0f9c9a243 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc0.20220401gite8b767f5e04097a.15.tar.bz2) = 9d0ee0c38b5dcba9a468a61e25c64832548c68f2459313a9714bc85682f0078bea58274860781d683d5d9fe84c2d9b95165d6b8f1bac914839f13c933c819f2a -SHA512 (kernel-kabi-dw-5.18.0-0.rc0.20220401gite8b767f5e04097a.15.tar.bz2) = 20b26ad7ff0e16f2406dc6ac35483591a83efe350659075e247caabb69bd7b0ac6ff0a4be6525958e8275d93b5b8c5dbcf52723f36cea69347fa2130647b3c77 +SHA512 (linux-5.18-rc1.tar.xz) = 155c3f491d890d3a9b03ce85e6ec1db2c43b569a40a06f3d290da560c442d08803e6f5653915008a85ac83d2e645ca51a97005676f13b0c3feae2d3cbac7b30b +SHA512 (kernel-abi-stablelists-5.18.0-0.rc1.18.tar.bz2) = 938df52ea372a9876fb51f7becff2c7fa51db9894135af4b944bd9dfe16298d32197a1a6f9b4704abb79504d70df8e70993e55d2920119734c3b69afc76fa718 +SHA512 (kernel-kabi-dw-5.18.0-0.rc1.18.tar.bz2) = 8a3d9da5820b7f56f9de8228ef021e7d0533b48f4fe12106e1ec83d8717914bd11a23ede0208a45d6732e0df3a16e7925ce68aa1b6b71ebd8c1fdd2513123aac |