From fb71d65622038eb760e4c2e7f06ef775bf0ce61a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 8 Feb 2023 10:19:36 -0600 Subject: [PATCH] kernel-6.2.0-0.rc7.20230208git0983f6bf2bfc.52 * Wed Feb 08 2023 Fedora Kernel Team [6.2.0-0.rc7.0983f6bf2bfc.52] - redhat/configs: enable CONFIG_INET_DIAG_DESTROY (Andrea Claudi) - Enable TDX Guest driver (Vitaly Kuznetsov) - Linux v6.2.0-0.rc7.0983f6bf2bfc Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 4 ++-- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 4 ++-- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-debug-rhel.config | 4 ++-- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 4 ++-- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 4 ++-- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 4 ++-- kernel-s390x-zfcpdump-rhel.config | 4 ++-- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 4 ++-- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 4 ++-- kernel.spec | 11 ++++++++--- sources | 6 +++--- 24 files changed, 42 insertions(+), 37 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 72df93ba9..2985ff225 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 = 51 +RHEL_RELEASE = 52 # # ZSTREAM diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d7695fa77..b1b4c9d4f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7977,7 +7977,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c4a686f93..28e70a9c3 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2437,7 +2437,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6328,7 +6328,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m # CONFIG_TEGRA186_GPC_DMA is not set CONFIG_TEGRA186_TIMER=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 2b4162ada..22cfc3ce9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7954,7 +7954,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index bb7d0c4ab..2f7e33f22 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2421,7 +2421,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6303,7 +6303,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m # CONFIG_TEGRA186_GPC_DMA is not set CONFIG_TEGRA186_TIMER=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 3e212223f..0919f91a2 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -8034,7 +8034,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 60ed15d4f..b2d203980 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -8013,7 +8013,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index cda0cdcef..72f86431f 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7805,7 +7805,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index fc345e859..711ae85a0 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -7784,7 +7784,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set CONFIG_TCS3472=m -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEGRA124_EMC=m CONFIG_TEGRA186_GPC_DMA=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 08f2b025c..23eb4e5ae 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6713,7 +6713,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index fe094b779..c9f6dc383 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2238,7 +2238,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6068,7 +6068,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 10b164c2c..a809e181c 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6690,7 +6690,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 7b39c47a5..c0bdb610f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2222,7 +2222,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6045,7 +6045,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0532e2fb9..f610fd86f 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6652,7 +6652,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b69e9cdb3..e8b6da84f 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2224,7 +2224,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6042,7 +6042,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e43071cf2..01000a0b6 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-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_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ffb98d7ce..f7cb6841b 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2208,7 +2208,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6019,7 +6019,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ae6b8ec16..974b38e10 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2218,7 +2218,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6044,7 +6044,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 61f7b77e2..69a6edde8 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7102,7 +7102,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7fa67661f..fb19e8b86 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2362,7 +2362,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6290,7 +6290,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 575d23e65..fba0e12a5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7080,7 +7080,7 @@ CONFIG_TCP_CONG_YEAH=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TEHUTI=m CONFIG_TELCLOCK=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index baea5710d..7709b4382 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2346,7 +2346,7 @@ CONFIG_INET6_ESP=m CONFIG_INET6_ESP_OFFLOAD=m CONFIG_INET6_IPCOMP=m CONFIG_INET_AH=m -# CONFIG_INET_DIAG_DESTROY is not set +CONFIG_INET_DIAG_DESTROY=y CONFIG_INET_DIAG=y CONFIG_INET_ESPINTCP=y CONFIG_INET_ESP=m @@ -6266,7 +6266,7 @@ CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_MD5SIG=y # CONFIG_TCS3414 is not set # CONFIG_TCS3472 is not set -# CONFIG_TDX_GUEST_DRIVER is not set +CONFIG_TDX_GUEST_DRIVER=m CONFIG_TEE=m CONFIG_TELCLOCK=m CONFIG_TERANETICS_PHY=m diff --git a/kernel.spec b/kernel.spec index aab05bb18..f1cb24f5b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -132,13 +132,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc7.20230207git05ecb680708a.51 +%define pkgrelease 0.rc7.20230208git0983f6bf2bfc.52 %define kversion 6 -%define tarfile_release 6.2-rc7-11-g05ecb680708a +%define tarfile_release 6.2-rc7-18-g0983f6bf2bfc # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20230207git05ecb680708a.51%{?buildid}%{?dist} +%define specrelease 0.rc7.20230208git0983f6bf2bfc.52%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -3325,6 +3325,11 @@ fi # # %changelog +* Wed Feb 08 2023 Fedora Kernel Team [6.2.0-0.rc7.0983f6bf2bfc.52] +- redhat/configs: enable CONFIG_INET_DIAG_DESTROY (Andrea Claudi) +- Enable TDX Guest driver (Vitaly Kuznetsov) +- Linux v6.2.0-0.rc7.0983f6bf2bfc + * Tue Feb 07 2023 Fedora Kernel Team [6.2.0-0.rc7.05ecb680708a.51] - redhat/configs: Enable CONFIG_PCIE_PTM generically (Corinna Vinschen) - redhat: Add sub-RPM with a EFI unified kernel image for virtual machines (Vitaly Kuznetsov) diff --git a/sources b/sources index a19e3d003..27a48531b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc7-11-g05ecb680708a.tar.xz) = ae569c90f504f2b298c03f9e2d97f0b734f70cd8b14600ed66dd216c2b0831dd29ee0a7d7052399200a65af335aa26414decf68631663d14f0c74f87de755d16 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 4e7a677f5225a40792a818b26cf42d72b2e26b99109316f016d3a9905cb08e1bf29bed3cee46805b60d19fc57247c50c9d9997a4d0679c087c2f372411364c73 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 287e0b8651fa112ebc1a3aa50da9d2bacda6e894427897df6af7608137df49d344f6a9f64a95c1f3e4bde1a4d3f1e4059ee3f2fe58968f79c6d51364980b0ce8 +SHA512 (linux-6.2-rc7-18-g0983f6bf2bfc.tar.xz) = 7ab1f6a314f36805c433f62d5e91345253fd9baf393ad9d39602dceaed1d22f3df01d9b24a6a494d2d44c370578558ec6f6a9166cb5dda0fc76b2ce0f947b841 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = b8acfd80f9e15c1874412946c9267c761827f29fbfb6fd3d1d269886caf562e14002e350cc26aa0229587ecb65750268373717bd6b2c99de39b342d4e862ebf7 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = 868f91ed37c9d2291cb6ade4e961559141ff85c2079b0dabb447a26741d1eab12f591290c5394ad6607a5dcad9cd2685ec18097853022341676de8a3aba0d918