diff options
27 files changed, 62 insertions, 51 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 7c8ec09b0..4866906ef 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 = 29 +RHEL_RELEASE = 30 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index abcee541f..aee6d3827 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7626,7 +7626,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e3e790c23..17807878e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4380,7 +4380,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -6107,7 +6107,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0235fd171..fe76e9629 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7600,7 +7600,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index eca13a506..7dbd85836 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4358,7 +4358,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -6083,7 +6083,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 8709c0b3d..046908170 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7833,7 +7833,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 82fea75d7..3082df84e 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -7808,7 +7808,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index b0d18e386..ea24bdaeb 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7601,7 +7601,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 929f83406..2a03fb7b5 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -7576,7 +7576,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set CONFIG_TRUSTED_FOUNDATIONS=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index ebca15903..110b6a003 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6629,7 +6629,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6849,7 +6849,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 05a288405..6ba798a40 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6604,7 +6604,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6824,7 +6824,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 6851705f2..3e0fcf0f4 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6325,7 +6325,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6533,7 +6533,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 4c8819227..c6048e40f 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4179,7 +4179,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9f014372c..01e3d0e30 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6299,7 +6299,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6507,7 +6507,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 3586d027d..8f4432aac 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4161,7 +4161,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 03806ffc5..36aeba687 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6267,7 +6267,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6480,7 +6480,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index bb7a32d4d..b7e3b5a20 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4119,7 +4119,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -5820,7 +5820,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index fa8c4dbae..c6d65fbb3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6241,7 +6241,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6454,7 +6454,7 @@ CONFIG_TRACE_EVAL_MAP_FILE=y CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set # CONFIG_TRANSPARENT_HUGEPAGE is not set -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 3d4da9c07..3f0a9decc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4101,7 +4101,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -5800,7 +5800,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TREE_RCU=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 1884085e9..217b50c67 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4118,7 +4118,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -5828,7 +5828,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y # CONFIG_TRANSPARENT_HUGEPAGE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set CONFIG_TREE_RCU=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TSL2583 is not set # CONFIG_TSL2591 is not set # CONFIG_TSL2772 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index d77b65217..a83b72be2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6682,7 +6682,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6902,7 +6902,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index bdd1aaaf3..53aeafc06 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -190,7 +190,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_PTDMA is not set +CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -4343,7 +4343,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 55413c14c..34587af07 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6657,7 +6657,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TEE is not set +CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m @@ -6877,7 +6877,7 @@ CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_TRANSPARENT_HUGEPAGE=y -CONFIG_TRUSTED_KEYS=m +CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set # CONFIG_TS4800_WATCHDOG is not set # CONFIG_TSL2583 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index caee5a6bc..1263383ad 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -190,7 +190,7 @@ CONFIG_AMD_MEM_ENCRYPT=y CONFIG_AMD_NUMA=y CONFIG_AMD_PHY=m CONFIG_AMD_PMC=m -# CONFIG_AMD_PTDMA is not set +CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set # CONFIG_AMD_XGBE_DCB is not set @@ -4322,7 +4322,7 @@ CONFIG_RD_LZO=y CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -# CONFIG_RD_ZSTD is not set +CONFIG_RD_ZSTD=y # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y diff --git a/kernel.spec b/kernel.spec index a6846424d..2777535ee 100755 --- a/kernel.spec +++ b/kernel.spec @@ -7,6 +7,8 @@ %global include_fedora 1 # Include RHEL files %global include_rhel 1 +# Provide Patchlist.changelog file +%global patchlist_changelog 1 # Disable LTO in userspace packages. %global _lto_cflags %{nil} @@ -83,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 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc4.29 +%global distro_build 0.rc4.20211207gitcd8c917a56f2.30 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc4.29 +%define pkgrelease 0.rc4.20211207gitcd8c917a56f2.30 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.29%{?buildid}%{?dist} +%define specrelease 0.rc4.20211207gitcd8c917a56f2.30%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -687,7 +689,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc4.tar.xz +Source0: linux-5.16-rc4-12-gcd8c917a56f2.tar.xz Source1: Makefile.rhelver @@ -839,7 +841,9 @@ Source2002: kvm_stat.logrotate # source tree, but in the mean time we carry this to support the legacy workflow Source3000: merge.pl Source3001: kernel-local -Source3003: Patchlist.changelog +%if %{patchlist_changelog} +Source3002: Patchlist.changelog +%endif Source4000: README.rst Source4001: rpminspect.yaml @@ -1379,8 +1383,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc4 -c -mv linux-5.16-rc4 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc4-12-gcd8c917a56f2 -c +mv linux-5.16-rc4-12-gcd8c917a56f2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2977,6 +2981,13 @@ fi # # %changelog +* Tue Dec 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc4.20211207gitcd8c917a56f2.30] +- redhat/configs: enable CONFIG_AMD_PTDMA for ark (John W. Linville) +- redhat/configs: enable CONFIG_RD_ZSTD for rhel (Tao Liu) [2020132] +- fedora: build TEE as a module for all arches (Peter Robinson) +- common: build TRUSTED_KEYS in everywhere (Peter Robinson) +- redhat: make Patchlist.changelog generation conditional (Herton R. Krzesinski) + * Fri Dec 03 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc3.20211203git5f58da2befa5.26] - redhat/configs: Add two new CONFIGs (Prarit Bhargava) - redhat/configs: Remove dead CONFIG files (Prarit Bhargava) diff --git a/patch-5.16-redhat.patch b/patch-5.16-redhat.patch index fc065b3d6..37f041406 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 8e35d7804fef..5d682110a6ee 100644 +index ef967a26bcd3..ebaf1fbd54b4 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-rc4.tar.xz) = c4f38379c8e1fa38ad3b6c0819a8182ae061cb4cde8c30aee6c67b06ca4057cad2ec598a432884aa6282806d4a3f78537c74eecde94c0968559a1f828eede782 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc4.29.tar.bz2) = 1bd5e279f75abca2728b2198f5e94ec0afd3438da5be4df20037447a9a1e6d022c2f62d327b578f9a32ac62dfb476503c78ca245e4f46e336d607eaed9c8ac34 -SHA512 (kernel-kabi-dw-5.16.0-0.rc4.29.tar.bz2) = 388d97cfd148137e5a2ada6178a3d0518f273be7efdc2c3bfafaf658b9caced237a769ef82634109cdbd10486c0aba14cfcbe4c94a2093a376a1d12189390d0f +SHA512 (linux-5.16-rc4-12-gcd8c917a56f2.tar.xz) = fb622d715f1742fa2a1ec0ff51f621062d05f612a336829ff07d767cca725f61cd581add9b4bfc5f82e0df9e4eea251ba97ef7c1df31a46dedb17c86eb4268c2 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc4.20211207gitcd8c917a56f2.30.tar.bz2) = 02fb687a59316b882d5cc2ec6e5a31b7abf8ece47c24ad14d13fceecfe121cd17a8cb550c86c6737aa72d851e0e685ba760ebf020c5583260a378a3c349435c7 +SHA512 (kernel-kabi-dw-5.16.0-0.rc4.20211207gitcd8c917a56f2.30.tar.bz2) = 77d96fd4c1c9178e86ed5bc5951f76324a57fa581343a906a93fb1ac472e17280fe52702cc0b904334130788e263b6b8f194bdbcb2a3b9b31d3936fbd193da62 |