Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc7.git4.1.vanilla.knurd.1.fc30kernel-4.19.0-0.rc7.git4.1.vanilla.knurd.1.fc29kernel-4.19.0-0.rc7.git4.1.vanilla.knurd.1.fc28kernel-4.19.0-0.rc7.git4.1.vanilla.knurd.1.fc27

17 files changed, 49 insertions, 29 deletions

diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU b/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU
new file mode 100644
index 000000000..b2d5e0217
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_AMDGPU
@@ -0,0 +1 @@
+# CONFIG_DRM_AMDGPU is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_AST b/configs/fedora/generic/s390x/CONFIG_DRM_AST
new file mode 100644
index 000000000..bb4ed4ad2
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_AST
@@ -0,0 +1 @@
+# CONFIG_DRM_AST is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS b/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS
new file mode 100644
index 000000000..51413a5ec
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_BOCHS
@@ -0,0 +1 @@
+# CONFIG_DRM_BOCHS is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU b/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU
new file mode 100644
index 000000000..aee7bc74d
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_CIRRUS_QEMU
@@ -0,0 +1 @@
+# CONFIG_DRM_CIRRUS_QEMU is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006 b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006
new file mode 100644
index 000000000..07efc3d47
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_CH7006
@@ -0,0 +1 @@
+# CONFIG_DRM_I2C_CH7006 is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X
new file mode 100644
index 000000000..b04038c91
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_NXP_TDA998X
@@ -0,0 +1 @@
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164 b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164
new file mode 100644
index 000000000..44078d9b6
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_I2C_SIL164
@@ -0,0 +1 @@
+# CONFIG_DRM_I2C_SIL164 is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE b/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE
new file mode 100644
index 000000000..de609436d
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_LOAD_EDID_FIRMWARE
@@ -0,0 +1 @@
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200 b/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200
new file mode 100644
index 000000000..1f5d73662
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_MGAG200
@@ -0,0 +1 @@
+# CONFIG_DRM_MGAG200 is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU b/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU
new file mode 100644
index 000000000..c89c944cc
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_NOUVEAU
@@ -0,0 +1 @@
+# CONFIG_DRM_NOUVEAU is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_QXL b/configs/fedora/generic/s390x/CONFIG_DRM_QXL
new file mode 100644
index 000000000..cad6912c5
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_QXL
@@ -0,0 +1 @@
+# CONFIG_DRM_QXL is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_RADEON b/configs/fedora/generic/s390x/CONFIG_DRM_RADEON
new file mode 100644
index 000000000..f0807fbf6
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_RADEON
@@ -0,0 +1 @@
+# CONFIG_DRM_RADEON is not set
diff --git a/gitrev b/gitrev
index 1d379d611..114d236be 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-bb2d8f2f61047cbde08b78ec03e4ebdb01ee5434
+6b3944e42e2e554aa5a4be681ecd70dccd459114
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 1cdb54e78..d45722973 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1161,16 +1161,16 @@ CONFIG_DRM_AMD_ACP=y
 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 is not set
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_ARCPGU is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_BOCHS=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
-CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1183,19 +1183,19 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
-CONFIG_DRM_I2C_CH7006=m
+# CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
@@ -1218,8 +1218,8 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_RADEON=m
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_RADEON is not set
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index f5e7ddd07..b3f07400a 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1148,16 +1148,16 @@ CONFIG_DRM_AMD_ACP=y
 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 is not set
 CONFIG_DRM_AMDGPU_SI=y
 CONFIG_DRM_AMDGPU_USERPTR=y
 CONFIG_DRM_AMD_POWERPLAY=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 # CONFIG_DRM_ARCPGU is not set
-CONFIG_DRM_AST=m
-CONFIG_DRM_BOCHS=m
+# CONFIG_DRM_AST is not set
+# CONFIG_DRM_BOCHS is not set
 # CONFIG_DRM_CDNS_DSI is not set
-CONFIG_DRM_CIRRUS_QEMU=m
+# CONFIG_DRM_CIRRUS_QEMU is not set
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 # CONFIG_DRM_DEBUG_SELFTEST is not set
 CONFIG_DRM_DP_AUX_CHARDEV=y
@@ -1170,19 +1170,19 @@ CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_I2C_ADV7511 is not set
 CONFIG_DRM_I2C_ADV7533=y
-CONFIG_DRM_I2C_CH7006=m
+# CONFIG_DRM_I2C_CH7006 is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
-CONFIG_DRM_I2C_NXP_TDA998X=m
-CONFIG_DRM_I2C_SIL164=m
+# CONFIG_DRM_I2C_NXP_TDA998X is not set
+# CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_LEGACY is not set
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 # CONFIG_DRM_LVDS_ENCODER is not set
 CONFIG_DRM=m
 # CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
-CONFIG_DRM_MGAG200=m
+# CONFIG_DRM_MGAG200 is not set
 # CONFIG_DRM_MXSFB is not set
 CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU=m
+# CONFIG_DRM_NOUVEAU is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
@@ -1205,8 +1205,8 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PARADE_PS8622 is not set
-CONFIG_DRM_QXL=m
-CONFIG_DRM_RADEON=m
+# CONFIG_DRM_QXL is not set
+# CONFIG_DRM_RADEON is not set
 CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_RCAR_LVDS is not set
diff --git a/kernel.spec b/kernel.spec
index 0a4ec2ca9..05cdac731 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 7
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,8 +133,10 @@ Summary: The Linux kernel
 %define debugbuildsenabled 1
 
 # Kernel headers are being split out into a separate package
+%if 0%{fedora}
 %define with_headers 0
 %define with_cross_headers 0
+%endif
 
 %if %{with_verbose}
 %define make_opts V=1
@@ -1222,8 +1224,8 @@ cp_vmlinux()
 # from redhat-rpm-config assume that host == target so target arch
 # flags cause issues with the host compiler.
 %if !%{with_cross}
-%define build_hostcflags  %{build_cflags}
-%define build_hostldflags %{build_ldflags} -Wl,--build-id=uuid
+%define build_hostcflags  %{?build_cflags}
+%define build_hostldflags %{?build_ldflags} -Wl,--build-id=uuid
 %endif
 
 BuildKernel() {
@@ -1905,6 +1907,12 @@ fi
 #
 #
 %changelog
+* Fri Oct 12 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc7.git4.1
+- Linux v4.19-rc7-139-g6b3944e42e2e
+
+* Thu Oct 11 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc7.git3.1
+- Linux v4.19-rc7-61-g9f203e2f2f06
+
 * Wed Oct 10 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc7.git2.1
 - Linux v4.19-rc7-33-gbb2d8f2f6104
 
diff --git a/sources b/sources
index 857986d2d..6e83552b1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.18.tar.xz) = 950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038
 SHA512 (patch-4.19-rc7.xz) = 51e621612cc6717d64d8c9778d0db1cd7c4801747e881e8f08059058d03707418336b83044d0f3d554e8d0f40c8bd92bbfe4a68d15fcaf6d24f404a645769fce
-SHA512 (patch-4.19-rc7-git2.xz) = f9e6ecaf47090c12b5a5976541f6573180cc3817fc34620a1f198461f0c6b14cc71e294eb3e7461fd055236619e235c08114b612b844b6ce0b8b379ecf763789
+SHA512 (patch-4.19-rc7-git4.xz) = c6a25ab4b76f4e5e8468615f031b123b18c5344e16fa3e07623cb307efd91a8dfe622f872da9110db621c90c30f1d183a7134376f76df7b1e2ca678409d5cb38