From a6ae349436c5bc66640eb6aeed211c5068dc71f4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 16 Apr 2021 08:35:47 -0500 Subject: kernel-5.11.15-0 * Fri Apr 16 2021 Justin M. Forbes [5.11.15-0] - Turn on CONFIG_VDPA_SIM_NET (rhbz 1942343) (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- 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-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.spec | 11 +++++++---- patch-5.11-redhat.patch | 2 +- sources | 6 +++--- 17 files changed, 25 insertions(+), 22 deletions(-) diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index b383adfcd..e49bf8bad 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -7823,7 +7823,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 05cd22a1a..cba8e9a22 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -7798,7 +7798,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index bafb89404..27587b3d1 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -8091,7 +8091,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m # CONFIG_VDSO is not set CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 1e7b68350..d7ecb47de 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -8067,7 +8067,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m # CONFIG_VDSO is not set CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index f7aca9c48..f02b4c111 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -7837,7 +7837,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 361edaece..201e9536b 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -7813,7 +7813,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VDSO=y CONFIG_VEML6030=m CONFIG_VEML6070=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 126967e77..d2a4354e5 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -7036,7 +7036,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 997f3028c..a69764234 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -7012,7 +7012,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 0678151a9..ad79a95a0 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -6618,7 +6618,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 9bb4fa33d..0c6e62965 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -6593,7 +6593,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a12a78cdb..a0ecb2da1 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6555,7 +6555,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 6ca859535..8e0f15590 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6530,7 +6530,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index b5c2e0ac5..c7afb26e6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7086,7 +7086,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 24eb28054..fb5e9bcfe 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7062,7 +7062,7 @@ CONFIG_VCNL4035=m CONFIG_VDPA=m CONFIG_VDPA_MENU=y CONFIG_VDPA_SIM=m -# CONFIG_VDPA_SIM_NET is not set +CONFIG_VDPA_SIM_NET=m CONFIG_VEML6030=m # CONFIG_VEML6070 is not set CONFIG_VETH=m diff --git a/kernel.spec b/kernel.spec index fd3ed1263..de97287f1 100755 --- a/kernel.spec +++ b/kernel.spec @@ -104,7 +104,7 @@ Summary: The Linux kernel %define primary_target rhel %endif -%define rpmversion 5.11.14 +%define rpmversion 5.11.15 %define stableversion 5.11 %define pkgrelease 100 @@ -603,7 +603,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.14.tar.xz +Source0: linux-5.11.15.tar.xz Source1: Makefile.rhelver @@ -1251,8 +1251,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.14 -c -mv linux-5.11.14 linux-%{KVERREL} +%setup -q -n kernel-5.11.15 -c +mv linux-5.11.15 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2765,6 +2765,9 @@ fi # # %changelog +* Fri Apr 16 2021 Justin M. Forbes [5.11.15-0] +- Turn on CONFIG_VDPA_SIM_NET (rhbz 1942343) (Justin M. Forbes) + * Wed Apr 14 2021 Justin M. Forbes [5.11.14-0] - Quick hack to reset release to 0 (Justin M. Forbes) - Add clarity to rebase notes since that change was backed out (Justin M. Forbes) diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch index b74f55738..a31904e3d 100644 --- a/patch-5.11-redhat.patch +++ b/patch-5.11-redhat.patch @@ -292,7 +292,7 @@ index 000000000000..c33a71263d9e + 2. Add the new profile name, along with a clear description of the + expected behaviour, to the sysfs-platform_profile ABI documentation. diff --git a/Makefile b/Makefile -index 9116941553b8..39427f89a0cd 100644 +index bcd8764fead9..f58195f60045 100644 --- a/Makefile +++ b/Makefile @@ -495,6 +495,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE diff --git a/sources b/sources index 5ebacae45..8108491c5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.14.tar.xz) = ccf0eaf6df0dacd2984c361621f67a3d16cf7a7174155ebdf646f1acfec43e19ff942e6c17e5bc3b5dc7a300c32bdc6ee37877162c099f5bd9924244f9445467 -SHA512 (kernel-abi-whitelists-5.11.14-100.tar.bz2) = 3bb2833d03a07363c3f886fbbcfe1b6bc210815ff57fa353473b7dd6dc25ce2a0014c51ea3be558e570c981addb4fa610c4fd98f32fd885b4f1e4188ddcce353 -SHA512 (kernel-kabi-dw-5.11.14-100.tar.bz2) = 45d34e8493409b2f0cb1b12e74edafe5fa2ef1401ebd95674322bef8c9205f07fc72f5b4e4791395daf9a4d65d925bdcd0de6d3d11bd81d8a9e84f1cb1da6735 +SHA512 (linux-5.11.15.tar.xz) = 1434e667d17042b8f4acaff20826d0c879a3bf1101635e670e1c43fe670800bbc43ca54d6d51423d8b8c9c9281e03c6c23e3aa59f4aaeb41539c3f2187769520 +SHA512 (kernel-abi-whitelists-5.11.15-100.tar.bz2) = 5e7d68b090e508e14f8af39040ad0e60425bfe55800cde640e7d892aefd1132443a2b7c6dbd12e1a7cbe6b78a9f417236530933792d692389dc954ee011deff7 +SHA512 (kernel-kabi-dw-5.11.15-100.tar.bz2) = 0bc79ea8281914d0eebe75093b234db345e42df5a6f201c9225ab64d6d6cfb9ea5652f4728dc3dd3c7a00d5bd976929192265d363b59fb378576ad14e76992e0 -- cgit