Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc2.git4.1.vanilla.knurd.1.fc30kernel-5.0.0-0.rc2.git4.1.vanilla.knurd.1.fc29kernel-5.0.0-0.rc2.git4.1.vanilla.knurd.1.fc28

16 files changed, 19 insertions, 3 deletions

diff --git a/configs/fedora/generic/CONFIG_HSA_AMD b/configs/fedora/generic/CONFIG_HSA_AMD
new file mode 100644
index 000000000..7a5701ba9
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_HSA_AMD
@@ -0,0 +1 @@
+CONFIG_HSA_AMD=y
diff --git a/gitrev b/gitrev
index e5a4991f8..16ce5a552 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-7fbfee7c80ded94278f109aae4063741c323294a
+d7393226d15add056285c8fc86723d54d7e0c77d
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 64d751925..80c467461 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2098,6 +2098,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index b9ac1ab8e..203f1c4db 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2082,6 +2082,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 0a318bfee..ace4b4f23 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2181,6 +2181,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 0ce99e3ff..54a7188eb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2080,6 +2080,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index a728c9c71..6870c60ac 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2065,6 +2065,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 96990b643..fb89d9e32 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2166,6 +2166,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cb028094a..a0b60dd4b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1928,6 +1928,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 CONFIG_HSU_DMA=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 234b1d93d..08600953c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1911,6 +1911,7 @@ CONFIG_HP_WATCHDOG=m
 CONFIG_HPWDT_NMI_DECODING=y
 CONFIG_HP_WIRELESS=m
 CONFIG_HP_WMI=m
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 CONFIG_HSU_DMA=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 65f00540b..6a743e51a 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1753,6 +1753,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a68fb1c15..7f1396772 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1736,6 +1736,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 53a7647c1..36bcd8012 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1745,6 +1745,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index b8f5602f9..e5415f0f1 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1728,6 +1728,7 @@ CONFIG_HOTPLUG_PCI=y
 # CONFIG_HP206C is not set
 # CONFIG_HPFS_FS is not set
 # CONFIG_HP_ILO is not set
+CONFIG_HSA_AMD=y
 # CONFIG_HSI is not set
 # CONFIG_HSR is not set
 # CONFIG_HSU_DMA is not set
diff --git a/kernel.spec b/kernel.spec
index c6113181d..697242729 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 2
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 5.%{upstream_sublevel}.0
 %endif
@@ -1894,6 +1894,9 @@ fi
 #
 #
 %changelog
+* Fri Jan 18 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc2.git4.1
+- Linux v5.0-rc2-211-gd7393226d15a
+
 * Thu Jan 17 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc2.git3.1
 - Linux v5.0-rc2-145-g7fbfee7c80de
 
diff --git a/sources b/sources
index 36d4cdc2f..c4b42bebc 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.0-rc2.tar.gz) = 93d1d32cadc1d55354cc7706b718f3a6c46abdf635fda8e4a0c34d9fce79a3a2d8ec5d12850f9813cdea7c7236846b95e1db48498ed8c5b425abd36e4801ed81
-SHA512 (patch-5.0-rc2-git3.xz) = 40e3eae9083ad664e8adc1790837acc914e77c93de4aa0e2ac4a93959373ae5647b1e15716d7528c6bf7e6534807395025bba0d62094f5a743a587f2f0da8209
+SHA512 (patch-5.0-rc2-git4.xz) = a0884896d426503db9a0a6eef5d6771f6ba4111495733fbf883ea8a041e64940f18a04ac01ced76b9e9c45c248a89cbce0534e9cf14d79271f5065ce555c6386