From e68c5cb010a63cb314f977f23a4bd7b4ef6ccff4 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 14 Dec 2021 08:02:50 -0600
Subject: kernel-5.15-0

* Tue Dec 14 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0]
- Enable CONFIG_VFIO_NOIOMMU for Fedora (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel-aarch64-debug-fedora.config |  2 +-
 kernel-aarch64-fedora.config       |  2 +-
 kernel-x86_64-debug-fedora.config  |  2 +-
 kernel-x86_64-fedora.config        |  2 +-
 kernel.spec                        | 11 +++++++----
 patch-5.15-redhat.patch            |  2 +-
 sources                            |  6 +++---
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 1108c3c39..a277e40dc 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -8321,7 +8321,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e1964f414..400db7423 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -8295,7 +8295,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 # CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5c5471b80..7c1cb3c8a 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -7536,7 +7536,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 468d8b9e6..b522f36fc 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -7511,7 +7511,7 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_MDEV=m
-# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_NOIOMMU=y
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_VGA=y
diff --git a/kernel.spec b/kernel.spec
index fd846629b..47c43aa27 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -128,7 +128,7 @@ Summary: The Linux kernel
 # The kernel tarball/base version
 %define kversion 5.15
 
-%define rpmversion 5.15.7
+%define rpmversion 5.15.8
 %define patchversion 5.15
 %define pkgrelease 200
 
@@ -682,7 +682,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15.7.tar.xz
+Source0: linux-5.15.8.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1374,8 +1374,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.15.7 -c
-mv linux-5.15.7 linux-%{KVERREL}
+%setup -q -n kernel-5.15.8 -c
+mv linux-5.15.8 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2972,6 +2972,9 @@ fi
 #
 #
 %changelog
+* Tue Dec 14 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0]
+- Enable CONFIG_VFIO_NOIOMMU for Fedora (Justin M. Forbes)
+
 * Wed Dec 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0]
 - Revert "drm/i915: Implement Wa_1508744258" (Justin M. Forbes)
 - Revert "Revert "fuse: fix page stealing"" (Justin M. Forbes)
diff --git a/patch-5.15-redhat.patch b/patch-5.15-redhat.patch
index 60d2bf873..6a71c1927 100644
--- a/patch-5.15-redhat.patch
+++ b/patch-5.15-redhat.patch
@@ -69,7 +69,7 @@ index 1396fd2d9031..4bc97128cee8 100644
  				This is normally done in pci_enable_device(),
  				so this option is a temporary workaround
 diff --git a/Makefile b/Makefile
-index 2d85216b1493..6c9277288453 100644
+index 72344b214bba..efa8577eb3fa 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index e5e7a75c4..bb6e1e83a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15.7.tar.xz) = 97fe7447858efadb2e80f36cd92b0d6fdd6a2fa66c22ed36b2f78f6b3bdc9136c4b15ab86b490a1e952dc9eae05f954e57a0edd33143bbcd9884d4f58dd927f5
-SHA512 (kernel-abi-stablelists-5.15.7-200.tar.bz2) = 437b0e4ddf5f810914397f63de648c6a7ccde62b6b653063549484794d719767dc9e65c8b26554e6fbb6f9d7a5338401234d1280eda39d00f24ffc26c96b2d80
-SHA512 (kernel-kabi-dw-5.15.7-200.tar.bz2) = 93100527d8574e41bb102606c62382073e8c3d54a169eb4e1bb92cc4bf3c0915c1e246d25d18fe2df87860488bdbfacfbfcce5539ff71436822cbe14e4927958
+SHA512 (linux-5.15.8.tar.xz) = 94455b1edc647abd0a2832c6657a0b4ec7208ed5bfee2785f91cf66ae82c9b18c7285c5a17e33ea15919cdad06889c309e7fac3fb1c449cc1160723cca8fd0c3
+SHA512 (kernel-abi-stablelists-5.15.8-200.tar.bz2) = 32141a4fa5132f43c65d7abee46b723a73f9ae29bac6f34cae71917c746ab58c8c135110625129801b536ce1f0eb67840e1bab04518f29158ff5b5f131467e21
+SHA512 (kernel-kabi-dw-5.15.8-200.tar.bz2) = 699bd0cefd1df656eebba0f8d297fa4020e159c2d1e3c7cd7e570755ad1db4fc09bbaba504b4b440262e0f8490e41f1cc366d9abc034a230244556aa3beed89b
-- 
cgit