Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc1.git4.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc1.git4.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc1.git4.1.vanilla.knurd.1.fc26

22 files changed, 28 insertions, 22 deletions

diff --git a/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI b/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI
index 78dd0a3c6..db6f0aeac 100644
--- a/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI
+++ b/configs/fedora/generic/CONFIG_DRM_AMDGPU_SI
@@ -1 +1 @@
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
diff --git a/gitrev b/gitrev
index 79b4771cb..cd03a3884 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-e525de3ab04621d227330aa82cd4073c0b0f3579
+1388c80438e69fc01d83fbe98da3cac24c3c8731
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index a3ac077a6..a6ffc594a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1283,7 +1283,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index f3a894090..f7dd6976b 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1273,7 +1273,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 3f7d04472..31b5f3a2a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1339,7 +1339,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 8d2451ee6..815a6e652 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1284,7 +1284,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index c02b5e241..c098694be 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1274,7 +1274,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5cdc45491..74755df13 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1329,7 +1329,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 800dd06ad..f229490b9 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -1124,7 +1124,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 610b87ec2..178a17e84 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -1135,7 +1135,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index d26600cfc..8d95bff0e 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1135,7 +1135,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 52b6c48f6..bd88ced88 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1124,7 +1124,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index eb76a44fc..82d89af16 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -1099,7 +1099,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 8ebd3e251..65be666c5 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -1088,7 +1088,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 47d622825..6beb468b0 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1054,7 +1054,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 6b1c83f23..2ce40e324 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1043,7 +1043,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 6837405b2..498a8baf6 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1054,7 +1054,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 859aece94..372982208 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1043,7 +1043,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 35317db28..738e9f1aa 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1182,7 +1182,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index bf1c130ed..0b69252a2 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1171,7 +1171,7 @@ CONFIG_DRM_AMD_DC=y
 CONFIG_DRM_AMDGPU_CIK=y
 # CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
 CONFIG_DRM_AMDGPU=m
-# CONFIG_DRM_AMDGPU_SI is not set
+CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
diff --git a/kernel.spec b/kernel.spec
index c42e468b1..4e8b7faa7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 1
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -1886,6 +1886,12 @@ fi
 #
 #
 %changelog
+* Fri Feb 16 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git4.1
+- Linux v4.16-rc1-100-g1388c80438e6
+
+* Thu Feb 15 2018 François Cami <fcami@fedoraproject.org>
+- Enable CONFIG_DRM_AMDGPU_SI
+
 * Thu Feb 15 2018 Jeremy Cline <jeremy@jcline.org> - 4.16.0-0.rc1.git3.1
 - Linux v4.16-rc1-88-ge525de3ab046
 
diff --git a/sources b/sources
index ab95b6a08..8392b96d4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.15.tar.xz) = c00d92659df815a53dcac7dde145b742b1f20867d380c07cb09ddb3295d6ff10f8931b21ef0b09d7156923a3957b39d74d87c883300173b2e20690d2b4ec35ea
 SHA512 (patch-4.16-rc1.xz) = bedbdd6d8e08734083b03ef453e4f46b17016a936ebbd0a1908df7b5a3bdcfc0990d35f4dff83fd83008e4dfe326ccc9f406080cd8818c2d24e20eadaf37598b
-SHA512 (patch-4.16-rc1-git3.xz) = cd66333bb7ebd1e9ec62313e55fc61cf4dff550a11b598356ab43fe4dae9fc9293c110a6ec88f5928b0a57bba4d611a6c061f03c76479c12d70e6f29e38f6b60
+SHA512 (patch-4.16-rc1-git4.xz) = 42de6078146004a310e45d53b9a4942771b57e4b3dcedbb52adf9a2f91736994a86f07b950f7fc7a09ec4eb63717e805f36e8fb6126b36f69f139ef04f17a605