Linux v5.0-rc2

9 files changed, 13 insertions, 48 deletions

diff --git a/.gitignore b/.gitignore
index 016c19c4b..0fbee4b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ perf-man-*.tar.gz
 kernel-headers/
 kernel-tools/
 /linux-5.0-rc1.tar.gz
+/linux-5.0-rc2.tar.gz
diff --git a/0001-Drop-that-def_bool.patch b/0001-Drop-that-def_bool.patch
deleted file mode 100644
index 296e76393..000000000
--- a/0001-Drop-that-def_bool.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From d8a29c727d073b674adcf7ca122c3e5d04ba54ff Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 2 Jan 2019 08:13:21 -0800
-Subject: [PATCH] Drop that def_bool
-
-I don't know why
-
-BUILDSTDERR: In file included from drivers/vfio/pci/trace.h:102,
-BUILDSTDERR:                  from drivers/vfio/pci/vfio_pci_nvlink2.c:29:
-BUILDSTDERR: ./include/trace/define_trace.h:89:42: fatal error: ./trace.h: No such file or directory
-BUILDSTDERR:  #include TRACE_INCLUDE(TRACE_INCLUDE_FILE)
-BUILDSTDERR:                                           ^
-BUILDSTDERR: compilation terminated.
-BUILDSTDERR: make[3]: *** [scripts/Makefile.build:277: drivers/vfio/pci/vfio_pci_nvlink2.o] Error 1
-BUILDSTDERR: make[2]: *** [scripts/Makefile.build:492: drivers/vfio/pci] Error 2
-BUILDSTDERR: make[1]: *** [scripts/Makefile.build:492: drivers/vfio] Error 2
-BUILDSTDERR: make: *** [Makefile:1053: drivers] Error 2
-BUILDSTDERR: make: *** Waiting for unfinished jobs....
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/vfio/pci/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/vfio/pci/Kconfig b/drivers/vfio/pci/Kconfig
-index d0f8e4f5a039..11efd2099797 100644
---- a/drivers/vfio/pci/Kconfig
-+++ b/drivers/vfio/pci/Kconfig
-@@ -40,7 +40,7 @@ config VFIO_PCI_IGD
- 	  To enable Intel IGD assignment through vfio-pci, say Y.
- 
- config VFIO_PCI_NVLINK2
--	def_bool y
-+	bool y
- 	depends on VFIO_PCI && PPC_POWERNV
- 	help
- 	  VFIO PCI support for P9 Witherspoon machine with NVIDIA V100 GPUs
--- 
-2.20.1
-
diff --git a/configs/fedora/generic/x86/CONFIG_X86_RESCTRL b/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
new file mode 100644
index 000000000..81d50f7c6
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_X86_RESCTRL
@@ -0,0 +1 @@
+CONFIG_X86_RESCTRL=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 661df7272..d484f53f5 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -6633,6 +6633,7 @@ CONFIG_X86_PTDUMP=y
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 160018e94..0a9f203ee 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -6611,6 +6611,7 @@ CONFIG_X86_POWERNOW_K8=m
 # CONFIG_X86_RDC321X is not set
 # CONFIG_X86_REBOOTFIXUPS is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 CONFIG_X86_SPEEDSTEP_ICH=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5579ae9d3..c3aa9840b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -6674,6 +6674,7 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POWERNOW_K8=m
 CONFIG_X86_PTDUMP=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SYSFB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index d0f0f631f..33977108a 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -6652,6 +6652,7 @@ CONFIG_X86_PM_TIMER=y
 CONFIG_X86_POWERNOW_K8=m
 # CONFIG_X86_PTDUMP is not set
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_RESCTRL=y
 CONFIG_X86_RESERVE_LOW=64
 # CONFIG_X86_SPEEDSTEP_CENTRINO is not set
 # CONFIG_X86_SYSFB is not set
diff --git a/kernel.spec b/kernel.spec
index 0c0c6629f..b70416e3c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,9 +69,9 @@ Summary: The Linux kernel
 # Work around for major version bump
 %define upstream_sublevel 0
 # The rc snapshot level
-%global rcrev 1
+%global rcrev 2
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -426,7 +426,7 @@ BuildRequires: binutils-%{_build_arch}-linux-gnu, gcc-%{_build_arch}-linux-gnu
 %endif
 
 # Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
-Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc1.tar.gz
+Source0: https://git.kernel.org/torvalds/t/linux-5.0-rc2.tar.gz
 
 Source11: x509.genkey
 Source12: remove-binary-diff.pl
@@ -596,9 +596,6 @@ Patch350: Allwinner-A64-timer-workaround.patch
 # rhbz 1431375
 Patch501: input-rmi4-remove-the-need-for-artifical-IRQ.patch
 
-# nvlink failure
-Patch502: 0001-Drop-that-def_bool.patch
-
 # CVE-2019-3701 rhbz 1663729 1663730
 Patch503: CVE-2019-3701.patch
 
@@ -1876,6 +1873,9 @@ fi
 #
 #
 %changelog
+* Mon Jan 14 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc2.git0.1
+- Linux v5.0-rc2
+
 * Mon Jan 14 2019 Laura Abbott <labbott@redhat.com>
 - Disable debugging options.
 
diff --git a/sources b/sources
index b4b19039e..361b57647 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (linux-5.0-rc1.tar.gz) = acad161b8cd164c2ee63f7bf937655b1618a357be3cf0afa90b987f4697005987bed1a911228d1f77a188f2c008041fe1ac7e5055797abcaf3d8b4a92aef8552
-SHA512 (patch-5.0-rc1-git4.xz) = fd24d550a12981060883bf830777ebf6569db39fc9d241e28e24f69b19d35de49c274ec411d22a0790b93b5c91ad477910fbeabc3ebdca0ba5d3c07ca8c16eee
+SHA512 (linux-5.0-rc2.tar.gz) = 93d1d32cadc1d55354cc7706b718f3a6c46abdf635fda8e4a0c34d9fce79a3a2d8ec5d12850f9813cdea7c7236846b95e1db48498ed8c5b425abd36e4801ed81