summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SOURCES/kernel-aarch64-debug-fedora.config2
-rw-r--r--SOURCES/kernel-aarch64-fedora.config2
-rw-r--r--SOURCES/kernel-armv7hl-debug-fedora.config2
-rw-r--r--SOURCES/kernel-armv7hl-fedora.config2
-rw-r--r--SOURCES/kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--SOURCES/kernel-armv7hl-lpae-fedora.config2
-rw-r--r--SOURCES/kernel-i686-debug-fedora.config2
-rw-r--r--SOURCES/kernel-i686-fedora.config2
-rw-r--r--SOURCES/kernel-ppc64le-debug-fedora.config2
-rw-r--r--SOURCES/kernel-ppc64le-fedora.config2
-rw-r--r--SOURCES/kernel-s390x-debug-fedora.config2
-rw-r--r--SOURCES/kernel-s390x-fedora.config2
-rw-r--r--SOURCES/kernel-x86_64-debug-fedora.config2
-rw-r--r--SOURCES/kernel-x86_64-fedora.config2
-rw-r--r--SOURCES/patch-5.11-redhat.patch2
-rwxr-xr-xSPECS/kernel.spec15
16 files changed, 24 insertions, 21 deletions
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config
index 31a3525..feec856 100644
--- a/SOURCES/kernel-aarch64-debug-fedora.config
+++ b/SOURCES/kernel-aarch64-debug-fedora.config
@@ -7825,7 +7825,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/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config
index f747ce7..2b3c44f 100644
--- a/SOURCES/kernel-aarch64-fedora.config
+++ b/SOURCES/kernel-aarch64-fedora.config
@@ -7800,7 +7800,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/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config
index c4d43e3..7652881 100644
--- a/SOURCES/kernel-armv7hl-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-debug-fedora.config
@@ -8093,7 +8093,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/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config
index 26376eb..d2f6340 100644
--- a/SOURCES/kernel-armv7hl-fedora.config
+++ b/SOURCES/kernel-armv7hl-fedora.config
@@ -8069,7 +8069,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/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
index 422f2c9..fd3d095 100644
--- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config
@@ -7839,7 +7839,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/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config
index e475980..2ca4be1 100644
--- a/SOURCES/kernel-armv7hl-lpae-fedora.config
+++ b/SOURCES/kernel-armv7hl-lpae-fedora.config
@@ -7815,7 +7815,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/SOURCES/kernel-i686-debug-fedora.config b/SOURCES/kernel-i686-debug-fedora.config
index d076cd6..2be1ecf 100644
--- a/SOURCES/kernel-i686-debug-fedora.config
+++ b/SOURCES/kernel-i686-debug-fedora.config
@@ -7038,7 +7038,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/SOURCES/kernel-i686-fedora.config b/SOURCES/kernel-i686-fedora.config
index d31f47e..8343f22 100644
--- a/SOURCES/kernel-i686-fedora.config
+++ b/SOURCES/kernel-i686-fedora.config
@@ -7014,7 +7014,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/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config
index 159f27f..4d8041c 100644
--- a/SOURCES/kernel-ppc64le-debug-fedora.config
+++ b/SOURCES/kernel-ppc64le-debug-fedora.config
@@ -6620,7 +6620,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/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config
index 453885d..43735ff 100644
--- a/SOURCES/kernel-ppc64le-fedora.config
+++ b/SOURCES/kernel-ppc64le-fedora.config
@@ -6595,7 +6595,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/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config
index 4569f3c..cbee205 100644
--- a/SOURCES/kernel-s390x-debug-fedora.config
+++ b/SOURCES/kernel-s390x-debug-fedora.config
@@ -6557,7 +6557,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/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config
index dcdb814..43662f2 100644
--- a/SOURCES/kernel-s390x-fedora.config
+++ b/SOURCES/kernel-s390x-fedora.config
@@ -6532,7 +6532,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/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config
index 4ec5003..39e3832 100644
--- a/SOURCES/kernel-x86_64-debug-fedora.config
+++ b/SOURCES/kernel-x86_64-debug-fedora.config
@@ -7088,7 +7088,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/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config
index 8962149..dff69ee 100644
--- a/SOURCES/kernel-x86_64-fedora.config
+++ b/SOURCES/kernel-x86_64-fedora.config
@@ -7064,7 +7064,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/SOURCES/patch-5.11-redhat.patch b/SOURCES/patch-5.11-redhat.patch
index b74f557..a31904e 100644
--- a/SOURCES/patch-5.11-redhat.patch
+++ b/SOURCES/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/SPECS/kernel.spec b/SPECS/kernel.spec
index 901dcae..80a4a28 100755
--- a/SPECS/kernel.spec
+++ b/SPECS/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 201
@@ -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
@@ -1255,8 +1255,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} .
@@ -2773,8 +2773,11 @@ fi
#
#
%changelog
-* Sat Apr 17 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.11.14-201.fsync
-- Linux v5.11.14 futex2 zen
+* Mon Apr 19 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.11.15-200
+- Linux v5.11.15 futex2 zen
+
+* 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)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 07:20:44 +0000