kernel-5.11.15-0

* Fri Apr 16 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.15-0] - Turn on CONFIG_VDPA_SIM_NET (rhbz 1942343) (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-04-16 08:20:10 -05:00 · 2021-04-16 08:20:10 -05:00 · 25d2b42ab1
parent 8c48960631
commit 25d2b42ab1
17 changed files with 25 additions and 22 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 200

@ -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 <jforbes@fedoraproject.org> [5.11.15-0]
+- Turn on CONFIG_VDPA_SIM_NET (rhbz 1942343) (Justin M. Forbes)
+
 * Wed Apr 14 2021 Justin M. Forbes <jforbes@fedoraproject.org> [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)
--- 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
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.11.14.tar.xz) = ccf0eaf6df0dacd2984c361621f67a3d16cf7a7174155ebdf646f1acfec43e19ff942e6c17e5bc3b5dc7a300c32bdc6ee37877162c099f5bd9924244f9445467
-SHA512 (kernel-abi-whitelists-5.11.14-200.tar.bz2) = 8274b22546912bd548c816097dd607223eb5571d602935f50603ba0ad1b534b97c12ce3c5a4a95fbb42c4204784bb887da37682bc0955ec8c2a23ec3c2de9ee4
-SHA512 (kernel-kabi-dw-5.11.14-200.tar.bz2) = 45d34e8493409b2f0cb1b12e74edafe5fa2ef1401ebd95674322bef8c9205f07fc72f5b4e4791395daf9a4d65d925bdcd0de6d3d11bd81d8a9e84f1cb1da6735
+SHA512 (linux-5.11.15.tar.xz) = 1434e667d17042b8f4acaff20826d0c879a3bf1101635e670e1c43fe670800bbc43ca54d6d51423d8b8c9c9281e03c6c23e3aa59f4aaeb41539c3f2187769520
+SHA512 (kernel-abi-whitelists-5.11.15-200.tar.bz2) = 36f684bd22b5e41eb80539e4f079b992dedfbf68af3146989b2d423e92640f3c9b3694ca4674ed4f2aef35d9ae77b9e3caa65308db30e66b5db277b7fa74c17b
+SHA512 (kernel-kabi-dw-5.11.15-200.tar.bz2) = 0bc79ea8281914d0eebe75093b234db345e42df5a6f201c9225ab64d6d6cfb9ea5652f4728dc3dd3c7a00d5bd976929192265d363b59fb378576ad14e76992e0