From d17020a31f96c5f444c15ee905d99cd84a78b0fa Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 10 Jan 2022 06:35:48 -0600 Subject: kernel-5.16-0.rc8.20220109git4634129ad9fd.59 * Sun Jan 09 2022 Fedora Kernel Team [5.16-0.rc8.20220109git4634129ad9fd.59] - redhat/configs: Migrate ZRAM_DEF_* configs to common/ (Neal Gompa) - redhat/configs: Enable CONFIG_CRYPTO_ZSTD (Neal Gompa) [2032758] - Turn CONFIG_DEVMEM back off for aarch64 (Justin M. Forbes) Resolves: rhbz#2032758 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 7 +++++-- kernel-aarch64-rhel.config | 9 ++++++--- kernel-ppc64le-debug-rhel.config | 5 ++++- kernel-ppc64le-rhel.config | 5 ++++- kernel-s390x-debug-rhel.config | 5 ++++- kernel-s390x-rhel.config | 5 ++++- kernel-s390x-zfcpdump-rhel.config | 5 ++++- kernel-x86_64-debug-rhel.config | 5 ++++- kernel-x86_64-rhel.config | 5 ++++- kernel.spec | 19 ++++++++++++------- patch-5.16-redhat.patch | 2 +- sources | 6 +++--- 13 files changed, 56 insertions(+), 24 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index daf5f7952..3fce608f4 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 = 57 +RHEL_RELEASE = 60 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 073d24b1c..e0969c6d7 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1063,7 +1063,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m CONFIG_CSD_LOCK_WAIT_DEBUG=y CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -5801,7 +5801,7 @@ CONFIG_STMMAC_PLATFORM=m # CONFIG_STM_SOURCE_CONSOLE is not set # CONFIG_STM_SOURCE_FTRACE is not set # CONFIG_STM_SOURCE_HEARTBEAT is not set -CONFIG_STRICT_DEVMEM=y +# CONFIG_STRICT_DEVMEM is not set CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_MODULE_RWX=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set @@ -6798,8 +6798,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 6bed2d158..052c051bf 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1063,7 +1063,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -1168,7 +1168,7 @@ CONFIG_DEV_DAX_KMEM=m CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM_COMPAT=m CONFIG_DEV_DAX_PMEM=m -CONFIG_DEVMEM=y +# CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS=y @@ -5777,7 +5777,7 @@ CONFIG_STMMAC_PLATFORM=m # CONFIG_STM_SOURCE_CONSOLE is not set # CONFIG_STM_SOURCE_FTRACE is not set # CONFIG_STM_SOURCE_HEARTBEAT is not set -CONFIG_STRICT_DEVMEM=y +# CONFIG_STRICT_DEVMEM is not set CONFIG_STRICT_KERNEL_RWX=y CONFIG_STRICT_MODULE_RWX=y # CONFIG_STRICT_SIGALTSTACK_SIZE is not set @@ -6774,8 +6774,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 318adf39b..5f23da07f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -918,7 +918,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m CONFIG_CSD_LOCK_WAIT_DEBUG=y CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -6564,8 +6564,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index e28f23eaa..1dfce96fc 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -918,7 +918,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -6544,8 +6544,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 26a59b560..ff9114564 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -919,7 +919,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m CONFIG_CSD_LOCK_WAIT_DEBUG=y CONFIG_CTCM=m CONFIG_CUSE=m @@ -6520,8 +6520,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set # CONFIG_ZPOOL is not set # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index dd1876b75..fc7f89263 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -919,7 +919,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CTCM=m CONFIG_CUSE=m @@ -6500,8 +6500,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set # CONFIG_ZPOOL is not set # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e415bfd44..da7e6865c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -924,7 +924,7 @@ CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=y CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=y # CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CTCM=m CONFIG_CUSE=m @@ -6529,8 +6529,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set # CONFIG_ZPOOL is not set # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_WRITEBACK=y CONFIG_ZRAM=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 615c575cd..286e11c13 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -979,7 +979,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m CONFIG_CSD_LOCK_WAIT_DEBUG=y CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -6818,8 +6818,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m CONFIG_ZRAM_MEMORY_TRACKING=y CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 761d04937..842f45354 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -979,7 +979,7 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO=y -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=m # CONFIG_CSD_LOCK_WAIT_DEBUG is not set CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set @@ -6795,8 +6795,11 @@ CONFIG_ZONE_DEVICE=y # CONFIG_ZPA2326 is not set CONFIG_ZPOOL=y # CONFIG_ZRAM_DEF_COMP_842 is not set +# CONFIG_ZRAM_DEF_COMP_LZ4HC is not set +# CONFIG_ZRAM_DEF_COMP_LZ4 is not set # CONFIG_ZRAM_DEF_COMP_LZO is not set CONFIG_ZRAM_DEF_COMP_LZORLE=y +# CONFIG_ZRAM_DEF_COMP_ZSTD is not set CONFIG_ZRAM=m # CONFIG_ZRAM_MEMORY_TRACKING is not set CONFIG_ZRAM_WRITEBACK=y diff --git a/kernel.spec b/kernel.spec index 6def05b33..f60fb38ce 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 -%global distro_build 0.rc8.20220107gitddec8ed2d490.57 +%global distro_build 60 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc8.20220107gitddec8ed2d490.57 +%define pkgrelease 60 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.20220107gitddec8ed2d490.57%{?buildid}%{?dist} +%define specrelease 60%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -689,7 +689,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc8-57-gddec8ed2d490.tar.xz +Source0: linux-5.16.tar.xz Source1: Makefile.rhelver @@ -1383,8 +1383,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc8-57-gddec8ed2d490 -c -mv linux-5.16-rc8-57-gddec8ed2d490 linux-%{KVERREL} +%setup -q -n kernel-5.16 -c +mv linux-5.16 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2981,6 +2981,11 @@ fi # # %changelog +* Sun Jan 09 2022 Fedora Kernel Team [5.16-0.rc8.20220109git4634129ad9fd.59] +- redhat/configs: Migrate ZRAM_DEF_* configs to common/ (Neal Gompa) +- redhat/configs: Enable CONFIG_CRYPTO_ZSTD (Neal Gompa) [2032758] +- Turn CONFIG_DEVMEM back off for aarch64 (Justin M. Forbes) + * Fri Jan 07 2022 Fedora Kernel Team [5.16-0.rc8.20220107gitddec8ed2d490.57] - Clean up excess text in Fedora config files (Justin M. Forbes) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index d68cc58e9..e42c28d97 100644 --- a/patch-5.16-redhat.patch +++ b/patch-5.16-redhat.patch @@ -128,7 +128,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 16d7f83ac368..52307591aa03 100644 +index 08510230b42f..6b4160ecf0bd 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 01097e2ac..316adbecf 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-rc8-57-gddec8ed2d490.tar.xz) = 6ac14b6e3a8a62cb8ec9131472b46856cd129ad9f21f569d0f675879a5e5646711a7575a6d35fc2c0f0ac7d4477ea3b05668f5d405852e507f2e6dff8ab2b2fc -SHA512 (kernel-abi-stablelists-5.16.0-0.rc8.20220107gitddec8ed2d490.57.tar.bz2) = 2299dcb8fbeb2f707cae0b7f9d32f17ca9dc2002f8253a8d7ae784187cf0e62e2d731c3fdef54dbfbd6e759bdae3b79bfa64056284a74a4617cd019c9d8a0887 -SHA512 (kernel-kabi-dw-5.16.0-0.rc8.20220107gitddec8ed2d490.57.tar.bz2) = de498e0f5d54fc443de45d77923793e356e2c13c68a345c8bf0e708e059f7b0ed43c3a246f8e7ec69703c39ce027880497fc8059c32581a7cf9e290b0e751426 +SHA512 (linux-5.16.tar.xz) = 7872f4296c9ee86157a70cc8c808d52dadfe9d91d0540e3a5054e21fd6d27a499cb5b05ad146361ed2d80ba24feb38ab0210fb9e484a20055f46835db7da3f5e +SHA512 (kernel-abi-stablelists-5.16.0-60.tar.bz2) = d154ad50cc3326a971988755403ade56d4db7363adc94b6f1ae137749a80a177acd830153e2034fdf3b35feff1ee166d3c17b31ad3451e5d5503b35ee48048e3 +SHA512 (kernel-kabi-dw-5.16.0-60.tar.bz2) = 2fe56d0ea720e1bac1406f73a44c5de41c822bace7bd3afeae27706d2a5fd4697f9d45d1809b5d24056ee5c00c5511735931c1819be2b94649df9cdf25562a19 -- cgit