summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel-i686-PAE.config1
-rw-r--r--kernel-i686-PAEdebug.config1
-rw-r--r--kernel-i686-debug.config1
-rw-r--r--kernel-i686.config1
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
-rw-r--r--kernel.spec7
-rw-r--r--sources3
8 files changed, 12 insertions, 4 deletions
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 662c1965b..d288f0dfc 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -6245,6 +6245,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 15f769acb..d69e98062 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -6270,6 +6270,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 45463df5f..25f257dff 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6270,6 +6270,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel-i686.config b/kernel-i686.config
index 72e126711..81a416f05 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6245,6 +6245,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 26d64790c..5226ae275 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6357,6 +6357,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index dbe3e69d7..570960c11 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6332,6 +6332,7 @@ CONFIG_VFIO=m
CONFIG_VFIO_MDEV_DEVICE=m
CONFIG_VFIO_MDEV=m
# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI_IGD=y
CONFIG_VFIO_PCI=m
CONFIG_VFIO_PCI_VGA=y
CONFIG_VGA_ARB_MAX_GPUS=16
diff --git a/kernel.spec b/kernel.spec
index e8fc04c04..325dc3ec5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,9 +67,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 3
+%global rcrev 4
# The git snapshot level
-%define gitrev 3
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1842,6 +1842,9 @@ fi
#
#
%changelog
+* Mon Jul 09 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git0.1
+- Linux v4.18-rc4
+
* Mon Jul 09 2018 Laura Abbott <labbott@redhat.com>
- Disable debugging options.
diff --git a/sources b/sources
index 7a4c5c29c..617fd9ca8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-SHA512 (patch-4.18-rc3.xz) = 9c6cb28585e1fa9e7b41a83314040c6b74fdb20c9a69041de9879412c92926f71aaac2c76f4f59c0ad25f06a2431ffa2fd2bd44c6413e7bb6ab078b90fa87f9d
-SHA512 (patch-4.18-rc3-git3.xz) = ddb6fd43212a140866eac848204fa10e237910b16538278a20f951eff19712877a3583dcac9f1892b6763911fc22de4505b1bdbb3fe70c98fdcad5ddad5e8a97
+SHA512 (patch-4.18-rc4.xz) = 6d2b502a0a183b3612d3fe64d7836d12087db18cb7446842b777b4e936c60da58faa22830668b1af2acb903ccbf5577bb7b337127c6d6b7778f51c4aa3296c08