summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-04-20 07:40:19 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-04-20 07:40:19 +0200
commitcf8fb9f608def942d2d75c6180bf886b197fa666 (patch)
treed614e499629dc78186b458093af9edacdaae0e6c
parentf7439742fcc7d1d1c529fd21ce1316bf03ec079b (diff)
parent61efc9cd0790f36b94d91c272b1f2c5562141faf (diff)
downloadkernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27.tar.gz
kernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27.tar.xz
kernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc1.git2.1.vanilla.knurd.1.fc27
-rw-r--r--configs/fedora/generic/CONFIG_SCSI_UFSHCD2
-rw-r--r--configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS (renamed from configs/fedora/generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD1
-rw-r--r--configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PCI (renamed from configs/fedora/generic/CONFIG_SCSI_UFSHCD_PCI)0
-rw-r--r--configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM1
-rw-r--r--configs/fedora/generic/arm/CONFIG_UFS_FS1
-rw-r--r--configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_DRM1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_DRM_PANEL1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_FB2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_HWMON2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_MFD_CORE2
-rw-r--r--configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD1
-rw-r--r--configs/fedora/generic/s390x/CONFIG_SYNC_FILE1
-rw-r--r--configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD1
-rw-r--r--configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI1
-rw-r--r--configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PLATFORM (renamed from configs/fedora/generic/CONFIG_SCSI_UFSHCD_PLATFORM)0
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config8
-rw-r--r--kernel-aarch64.config8
-rw-r--r--kernel-armv7hl-debug.config6
-rw-r--r--kernel-armv7hl-lpae-debug.config7
-rw-r--r--kernel-armv7hl-lpae.config7
-rw-r--r--kernel-armv7hl.config6
-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-ppc64-debug.config5
-rw-r--r--kernel-ppc64.config5
-rw-r--r--kernel-ppc64le-debug.config5
-rw-r--r--kernel-ppc64le.config5
-rw-r--r--kernel-s390x-debug.config19
-rw-r--r--kernel-s390x.config19
-rw-r--r--kernel-x86_64-debug.config1
-rw-r--r--kernel-x86_64.config1
-rw-r--r--kernel.spec8
-rw-r--r--sources2
43 files changed, 85 insertions, 59 deletions
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/CONFIG_SCSI_UFSHCD
index 041b8209b..542c89fc7 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD
+++ b/configs/fedora/generic/CONFIG_SCSI_UFSHCD
@@ -1 +1 @@
-CONFIG_SCSI_UFSHCD=m
+# CONFIG_SCSI_UFSHCD is not set
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM b/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM
new file mode 100644
index 000000000..41483b33b
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_SCSI_UFS_DWC_TC_PLATFORM
@@ -0,0 +1 @@
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS
index 936bcab6c..936bcab6c 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_PHY_QCOM_UFS
+++ b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_UFS
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD
new file mode 100644
index 000000000..041b8209b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PCI b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PCI
index 4907ac2e6..4907ac2e6 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PCI
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PCI
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM
new file mode 100644
index 000000000..59f9929cd
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFSHCD_PLATFORM
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD_PLATFORM=m
diff --git a/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM b/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM
new file mode 100644
index 000000000..9f663a316
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_SCSI_UFS_QCOM
@@ -0,0 +1 @@
+CONFIG_SCSI_UFS_QCOM=m
diff --git a/configs/fedora/generic/arm/CONFIG_UFS_FS b/configs/fedora/generic/arm/CONFIG_UFS_FS
deleted file mode 100644
index 768c9ac9e..000000000
--- a/configs/fedora/generic/arm/CONFIG_UFS_FS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_UFS_FS is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
deleted file mode 100644
index 50ac1d830..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_UFS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PHY_QCOM_UFS is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
index 9cd604bc5..7073bf67e 100644
--- a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
+++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_CLASS_DEVICE
@@ -1 +1 @@
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
diff --git a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
index 3ee77acd7..ac802ca1c 100644
--- a/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
+++ b/configs/fedora/generic/s390x/CONFIG_BACKLIGHT_LCD_SUPPORT
@@ -1 +1 @@
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM b/configs/fedora/generic/s390x/CONFIG_DRM
new file mode 100644
index 000000000..1ba603c1c
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM
@@ -0,0 +1 @@
+CONFIG_DRM=m
diff --git a/configs/fedora/generic/s390x/CONFIG_DRM_PANEL b/configs/fedora/generic/s390x/CONFIG_DRM_PANEL
new file mode 100644
index 000000000..de8a9c247
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_DRM_PANEL
@@ -0,0 +1 @@
+CONFIG_DRM_PANEL=y
diff --git a/configs/fedora/generic/s390x/CONFIG_FB b/configs/fedora/generic/s390x/CONFIG_FB
index 7310c1a02..093b4f67e 100644
--- a/configs/fedora/generic/s390x/CONFIG_FB
+++ b/configs/fedora/generic/s390x/CONFIG_FB
@@ -1 +1 @@
-# CONFIG_FB is not set
+CONFIG_FB=m
diff --git a/configs/fedora/generic/s390x/CONFIG_HWMON b/configs/fedora/generic/s390x/CONFIG_HWMON
index 65c3ac9f5..d67f2b72f 100644
--- a/configs/fedora/generic/s390x/CONFIG_HWMON
+++ b/configs/fedora/generic/s390x/CONFIG_HWMON
@@ -1 +1 @@
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
diff --git a/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT b/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
index e374ebd3c..75e39f8b6 100644
--- a/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
+++ b/configs/fedora/generic/s390x/CONFIG_I2C_ALGOBIT
@@ -1 +1 @@
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
diff --git a/configs/fedora/generic/s390x/CONFIG_MFD_CORE b/configs/fedora/generic/s390x/CONFIG_MFD_CORE
index 61d91aa6e..c8855e8a0 100644
--- a/configs/fedora/generic/s390x/CONFIG_MFD_CORE
+++ b/configs/fedora/generic/s390x/CONFIG_MFD_CORE
@@ -1 +1 @@
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
diff --git a/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD
deleted file mode 100644
index 542c89fc7..000000000
--- a/configs/fedora/generic/s390x/CONFIG_SCSI_UFSHCD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SCSI_UFSHCD is not set
diff --git a/configs/fedora/generic/s390x/CONFIG_SYNC_FILE b/configs/fedora/generic/s390x/CONFIG_SYNC_FILE
new file mode 100644
index 000000000..391ab547b
--- /dev/null
+++ b/configs/fedora/generic/s390x/CONFIG_SYNC_FILE
@@ -0,0 +1 @@
+CONFIG_SYNC_FILE=y
diff --git a/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD
new file mode 100644
index 000000000..041b8209b
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD=m
diff --git a/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI
new file mode 100644
index 000000000..4907ac2e6
--- /dev/null
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PCI
@@ -0,0 +1 @@
+CONFIG_SCSI_UFSHCD_PCI=m
diff --git a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PLATFORM b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PLATFORM
index 16e9439f5..16e9439f5 100644
--- a/configs/fedora/generic/CONFIG_SCSI_UFSHCD_PLATFORM
+++ b/configs/fedora/generic/x86/CONFIG_SCSI_UFSHCD_PLATFORM
diff --git a/gitrev b/gitrev
index e367fb2da..d737e7306 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-a27fc14219f2e3c4a46ba9177b04d9b52c875532
+87ef12027b9b1dd0e0b12cf311fbcb19f9d92539
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 6af1f95dd..e2c93a1ac 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4204,7 +4204,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
-# CONFIG_PHY_QCOM_UFS is not set
+CONFIG_PHY_QCOM_UFS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
@@ -4935,9 +4935,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6053,7 +6055,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 0a288e8c4..26405e625 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4182,7 +4182,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
CONFIG_PHY_QCOM_QMP=m
CONFIG_PHY_QCOM_QUSB2=m
-# CONFIG_PHY_QCOM_UFS is not set
+CONFIG_PHY_QCOM_UFS=m
CONFIG_PHY_QCOM_USB_HSIC=m
CONFIG_PHY_QCOM_USB_HS=m
CONFIG_PHY_ROCKCHIP_DP=m
@@ -4912,9 +4912,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6029,7 +6031,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 09b1cbdd6..5fdfddff5 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5255,9 +5255,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6517,7 +6519,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 53d1c59a0..f123578c5 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4238,6 +4238,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS=m
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHY_ROCKCHIP_DP=m
@@ -4949,9 +4950,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6100,7 +6103,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0fba79caf..f551319c9 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4216,6 +4216,7 @@ CONFIG_PHY_MVEBU_SATA=y
# CONFIG_PHY_PXA_28NM_HSIC is not set
# CONFIG_PHY_PXA_28NM_USB2 is not set
# CONFIG_PHY_QCOM_IPQ806X_SATA is not set
+CONFIG_PHY_QCOM_UFS=m
# CONFIG_PHY_QCOM_USB_HSIC is not set
# CONFIG_PHY_QCOM_USB_HS is not set
CONFIG_PHY_ROCKCHIP_DP=m
@@ -4926,9 +4927,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6076,7 +6079,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 33d140d78..5fec27c8c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5232,9 +5232,11 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_QCOM=m
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
@@ -6493,7 +6495,7 @@ CONFIG_UCSI=m
CONFIG_UDF_FS=m
# CONFIG_UEVENT_HELPER is not set
# CONFIG_UFS_DEBUG is not set
-# CONFIG_UFS_FS is not set
+CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set
CONFIG_UHID=m
CONFIG_UIO_AEC=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 87b065743..0d1336824 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4596,6 +4596,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index d7b9ab84c..ea83c8d92 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4618,6 +4618,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 867ad3d79..ac8bf13e1 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4618,6 +4618,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 5afd0ec5e..479e78b80 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4596,6 +4596,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 45c54e3ff..ef1713420 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4430,9 +4430,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 28a0b0271..3fd28437a 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4406,9 +4406,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 98454b390..e3452e082 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4369,9 +4369,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e02a91f6a..1ceeccc9e 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4345,9 +4345,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
-CONFIG_SCSI_UFSHCD=m
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
+# CONFIG_SCSI_UFSHCD is not set
CONFIG_SCSI_VIRTIO=m
CONFIG_SCSI_WD719X=m
CONFIG_SCSI=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index a4ab1a0e4..75eccd295 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -306,10 +306,10 @@ CONFIG_B53_SRAB_DRIVER=m
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_ARCXCNN=m
# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3630 is not set
# CONFIG_BACKLIGHT_LM3639 is not set
@@ -1100,7 +1100,6 @@ CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_LVDS is not set
@@ -1117,6 +1116,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# 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_R128 is not set
@@ -1353,8 +1353,8 @@ CONFIG_FB_EFI=y
# CONFIG_FB_I740 is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
+CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1738,7 +1738,7 @@ CONFIG_HVC_IUCV=y
CONFIG_HW_CONSOLE=y
CONFIG_HWLAT_TRACER=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_S390=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1751,7 +1751,7 @@ CONFIG_HYSDN_CAPI=y
CONFIG_HYSDN=m
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -2704,7 +2704,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
@@ -4272,9 +4272,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
# CONFIG_SCSI_UFSHCD is not set
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
CONFIG_SCSI_VIRTIO=m
# CONFIG_SCSI_WD719X is not set
CONFIG_SCSI=y
@@ -4980,7 +4979,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9500 is not set
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
# CONFIG_SYNCLINK_CS is not set
CONFIG_SYNCLINK_GT=m
CONFIG_SYNCLINK=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 7b03cb78e..ae4361772 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -305,10 +305,10 @@ CONFIG_B53_SRAB_DRIVER=m
# CONFIG_BACKLIGHT_ADP8870 is not set
CONFIG_BACKLIGHT_ARCXCNN=m
# CONFIG_BACKLIGHT_BD6107 is not set
-# CONFIG_BACKLIGHT_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=m
# CONFIG_BACKLIGHT_GENERIC is not set
# CONFIG_BACKLIGHT_GPIO is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_BACKLIGHT_LM3630A is not set
# CONFIG_BACKLIGHT_LM3630 is not set
# CONFIG_BACKLIGHT_LM3639 is not set
@@ -1089,7 +1089,6 @@ CONFIG_DRM_NOUVEAU=m
# CONFIG_DRM_NXP_PTN3460 is not set
# CONFIG_DRM_PANEL_ILITEK_IL9322 is not set
# CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
-# CONFIG_DRM_PANEL is not set
# CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
# CONFIG_DRM_PANEL_LG_LG4573 is not set
# CONFIG_DRM_PANEL_LVDS is not set
@@ -1106,6 +1105,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
# CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
# CONFIG_DRM_PANEL_SIMPLE is not set
# 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_R128 is not set
@@ -1334,8 +1334,8 @@ CONFIG_FB_EFI=y
# CONFIG_FB_I740 is not set
# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FB_IMSTT is not set
-# CONFIG_FB is not set
# CONFIG_FB_KYRO is not set
+CONFIG_FB=m
# CONFIG_FB_MATROX_G is not set
# CONFIG_FB_MATROX_I2C is not set
# CONFIG_FB_MATROX is not set
@@ -1719,7 +1719,7 @@ CONFIG_HVC_IUCV=y
CONFIG_HW_CONSOLE=y
CONFIG_HWLAT_TRACER=y
# CONFIG_HWMON_DEBUG_CHIP is not set
-# CONFIG_HWMON is not set
+CONFIG_HWMON=m
CONFIG_HWPOISON_INJECT=m
CONFIG_HW_RANDOM_S390=m
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1732,7 +1732,7 @@ CONFIG_HYSDN_CAPI=y
CONFIG_HYSDN=m
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
-# CONFIG_I2C_ALGOBIT is not set
+CONFIG_I2C_ALGOBIT=m
# CONFIG_I2C_ALGOPCA is not set
# CONFIG_I2C_ALGOPCF is not set
# CONFIG_I2C_ALI1535 is not set
@@ -2682,7 +2682,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
# CONFIG_MFD_AXP20X is not set
# CONFIG_MFD_BCM590XX is not set
# CONFIG_MFD_BD9571MWV is not set
-# CONFIG_MFD_CORE is not set
+CONFIG_MFD_CORE=m
# CONFIG_MFD_CPCAP is not set
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_CS5535 is not set
@@ -4248,9 +4248,8 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
# CONFIG_SCSI_UFSHCD is not set
-CONFIG_SCSI_UFSHCD_PCI=m
-# CONFIG_SCSI_UFSHCD_PLATFORM is not set
CONFIG_SCSI_VIRTIO=m
# CONFIG_SCSI_WD719X is not set
CONFIG_SCSI=y
@@ -4955,7 +4954,7 @@ CONFIG_SUNRPC_XPRT_RDMA=m
CONFIG_SWAP=y
# CONFIG_SW_SYNC is not set
# CONFIG_SX9500 is not set
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
# CONFIG_SYNCLINK_CS is not set
CONFIG_SYNCLINK_GT=m
CONFIG_SYNCLINK=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 5e8ecd13c..de92d86ab 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4701,6 +4701,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 3bc84751e..710a89eeb 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4679,6 +4679,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFS_DWC_TC_PLATFORM is not set
CONFIG_SCSI_UFSHCD=m
CONFIG_SCSI_UFSHCD_PCI=m
# CONFIG_SCSI_UFSHCD_PLATFORM is not set
diff --git a/kernel.spec b/kernel.spec
index 73fe85e63..6fccf845f 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 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -1889,6 +1889,12 @@ fi
#
#
%changelog
+* Thu Apr 19 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git2.1
+- Linux v4.17-rc1-28-g87ef12027b9b
+
+* Thu Apr 19 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable UFS storage options on ARM
+
* Wed Apr 18 2018 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix rhbz 1565354
diff --git a/sources b/sources
index 4e57ebce1..501192505 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
SHA512 (patch-4.17-rc1.xz) = a66f90c43b2855142711e80f2df61366bdb5dbe0ed257f549b36bb173f5f24fa87b6293ac284d00cb3c92f5708dbed5214313f8a31c6a98fa5cad29db9d4ad25
-SHA512 (patch-4.17-rc1-git1.xz) = bde6e142a0cfca439c9f6e8dff50a8889d281214099dc4200e5075a6ced04a4c7041e17ad45029e2cceb2bfc52a6f0cf57428407a3180b21cee2b80c2bbeff55
+SHA512 (patch-4.17-rc1-git2.xz) = 549c4cf0985641425ea657d1e2f07cec2b320a668609023293f6bc9822f5ff607b294afeba9f38b721a9fad76cb25f17a9c28364b469a54ddbe2c78748f899e5