summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-21 13:50:04 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-21 13:50:04 +0200
commitab028518655cf5f36e8a689ff551e2f624bd5e19 (patch)
treec2ed0ded50e1aebe7cb9413356996df7edd5b2f8
parent7b8dabaae719cb915f4ee557ead14531819be37d (diff)
parent25d2b42ab1190aeaa8f32815884eac711dd8ba68 (diff)
downloadkernel-ab028518655cf5f36e8a689ff551e2f624bd5e19.tar.gz
kernel-ab028518655cf5f36e8a689ff551e2f624bd5e19.tar.xz
kernel-ab028518655cf5f36e8a689ff551e2f624bd5e19.zip
Merge remote-tracking branch 'origin/f33' into f33-user-thl-vanilla-fedora
Diffstat
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec3
-rw-r--r--patch-5.11-redhat.patch2
-rw-r--r--sources6
17 files changed, 21 insertions, 18 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 da9d95668..acf2f011b 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -2771,6 +2771,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)
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 4ac541b7c..cbd8c3064 100644
--- a/sources
+++ b/sources
@@ -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
generated by cgit (git 2.34.1) at 2024-04-18 13:28:46 +0000