summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch44
-rw-r--r--configs/fedora/generic/CONFIG_OF_PMEM2
-rw-r--r--configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR1
-rw-r--r--configs/fedora/generic/arm/CONFIG_NVMEM_SUNXI_SID (renamed from configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_SUNXI_SID)0
-rw-r--r--configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR1
-rw-r--r--configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM89621
-rw-r--r--gitrev2
-rw-r--r--kernel-aarch64-debug.config3
-rw-r--r--kernel-aarch64.config3
-rw-r--r--kernel-armv7hl-debug.config6
-rw-r--r--kernel-armv7hl-lpae-debug.config3
-rw-r--r--kernel-armv7hl-lpae.config3
-rw-r--r--kernel-armv7hl.config6
-rw-r--r--kernel-i686-PAE.config2
-rw-r--r--kernel-i686-PAEdebug.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64-debug.config2
-rw-r--r--kernel-ppc64.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec16
-rw-r--r--sources3
29 files changed, 85 insertions, 35 deletions
diff --git a/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch b/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
new file mode 100644
index 000000000..56baf5ec6
--- /dev/null
+++ b/ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
@@ -0,0 +1,44 @@
+From patchwork Fri Apr 20 03:29:47 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: ACPI / scan: Fix regression related to X-Gene UARTs
+From: Mark Salter <msalter@redhat.com>
+X-Patchwork-Id: 10351797
+Message-Id: <20180420032947.23023-1-msalter@redhat.com>
+To: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= <frederic.danis.oss@gmail.com>
+Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
+ linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org
+Date: Thu, 19 Apr 2018 23:29:47 -0400
+
+Commit e361d1f85855 ("ACPI / scan: Fix enumeration for special UART
+devices") caused a regression with some X-Gene based platforms (Mustang
+and M400) with invalid DSDT. The DSDT makes it appear that the UART
+device is also a slave device attached to itself. With the above commit
+the UART won't be enumerated by ACPI scan (slave serial devices shouldn't
+be). So check for X-Gene UART device and skip slace device check on it.
+
+Signed-off-by: Mark Salter <msalter@redhat.com>
+---
+ drivers/acpi/scan.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
+index cc234e6a6297..1dcdd0122862 100644
+--- a/drivers/acpi/scan.c
++++ b/drivers/acpi/scan.c
+@@ -1551,6 +1551,14 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+ fwnode_property_present(&device->fwnode, "baud")))
+ return true;
+
++ /*
++ * Firmware on some arm64 X-Gene platforms will make the UART
++ * device appear as both a UART and a slave of that UART. Just
++ * bail out here for X-Gene UARTs.
++ */
++ if (!strcmp(acpi_device_hid(device), "APMC0D08"))
++ return false;
++
+ INIT_LIST_HEAD(&resource_list);
+ acpi_dev_get_resources(device, &resource_list,
+ acpi_check_serial_bus_slave,
diff --git a/configs/fedora/generic/CONFIG_OF_PMEM b/configs/fedora/generic/CONFIG_OF_PMEM
index 1099fba70..71309bbab 100644
--- a/configs/fedora/generic/CONFIG_OF_PMEM
+++ b/configs/fedora/generic/CONFIG_OF_PMEM
@@ -1 +1 @@
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
diff --git a/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
deleted file mode 100644
index be81f38c4..000000000
--- a/configs/fedora/generic/arm/CONFIG_NVMEM_SNVS_LPGPR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NVMEM_SNVS_LPGPR is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_SUNXI_SID b/configs/fedora/generic/arm/CONFIG_NVMEM_SUNXI_SID
index 454644aac..454644aac 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_SUNXI_SID
+++ b/configs/fedora/generic/arm/CONFIG_NVMEM_SUNXI_SID
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID b/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID
deleted file mode 100644
index 454644aac..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_NVMEM_SUNXI_SID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NVMEM_SUNXI_SID=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
new file mode 100644
index 000000000..717ba1a9f
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_AMX3_PM
@@ -0,0 +1 @@
+CONFIG_AMX3_PM=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR b/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR
new file mode 100644
index 000000000..21803b106
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_NVMEM_SNVS_LPGPR
@@ -0,0 +1 @@
+CONFIG_NVMEM_SNVS_LPGPR=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
deleted file mode 100644
index f9530246c..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_SND_SOC_IMX_WM8962
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_IMX_WM8962=m
diff --git a/gitrev b/gitrev
index 2b00fa37a..67125fead 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-43f70c960180c11d64ee3e9e53075fe1acd43ff1
+6d08b06e67cd117f6992c46611dfb4ce267cd71e
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e2c93a1ac..a5e4762b0 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3987,7 +3987,6 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4015,7 +4014,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 26405e625..9ec457e8c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3965,7 +3965,6 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
CONFIG_NUMA_BALANCING=y
CONFIG_NUMA=y
CONFIG_NVME_FC=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -3993,7 +3992,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 5fdfddff5..07638ed25 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -171,6 +171,7 @@ CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
# CONFIG_AMD_XGBE is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -4200,7 +4201,7 @@ CONFIG_NVEC_POWER=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4229,7 +4230,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
@@ -5850,7 +5851,6 @@ CONFIG_SND_SOC_IMX_PCM_FIQ=m
CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_WM8962=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f123578c5..45ca168cb 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4019,7 +4019,6 @@ CONFIG_NTB_SWITCHTEC=m
CONFIG_NTP_PPS=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4048,7 +4047,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index f551319c9..1cbfe127f 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3997,7 +3997,6 @@ CONFIG_NTB_SWITCHTEC=m
CONFIG_NTP_PPS=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4026,7 +4025,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5fec27c8c..459d5113c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -171,6 +171,7 @@ CONFIG_AMD_PHY=m
# CONFIG_AMD_XGBE_DCB is not set
# CONFIG_AMD_XGBE is not set
CONFIG_AMIGA_PARTITION=y
+CONFIG_AMX3_PM=m
# CONFIG_ANDROID is not set
# CONFIG_APDS9300 is not set
CONFIG_APDS9802ALS=m
@@ -4178,7 +4179,7 @@ CONFIG_NVEC_POWER=y
CONFIG_NVME_FC=m
CONFIG_NVMEM_IMX_IIM=m
CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_SNVS_LPGPR is not set
+CONFIG_NVMEM_SNVS_LPGPR=m
CONFIG_NVMEM_SUNXI_SID=m
CONFIG_NVME_MULTIPATH=y
CONFIG_NVMEM=y
@@ -4207,7 +4208,7 @@ CONFIG_OF_IRQ=y
CONFIG_OF_MDIO=y
CONFIG_OF_NET=y
CONFIG_OF_OVERLAY=y
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
CONFIG_OF_RESERVED_MEM=y
CONFIG_OF_RESOLVE=y
# CONFIG_OF_UNITTEST is not set
@@ -5826,7 +5827,6 @@ CONFIG_SND_SOC_IMX_PCM_FIQ=m
CONFIG_SND_SOC_IMX_SGTL5000=m
CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_IMX_SSI=m
-CONFIG_SND_SOC_IMX_WM8962=m
# CONFIG_SND_SOC_INNO_RK3036 is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 0d1336824..4bd00a3e4 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3827,7 +3827,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
CONFIG_OLPC_XO15_SCI=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index ea83c8d92..51237fbf2 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3848,7 +3848,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
CONFIG_OLPC_XO15_SCI=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ac8bf13e1..73abadf08 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3848,7 +3848,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
CONFIG_OLPC_XO15_SCI=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 479e78b80..9893cb666 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3827,7 +3827,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
CONFIG_OF=y
CONFIG_OLPC_XO15_SCI=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index ef1713420..d18e99dad 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3661,7 +3661,7 @@ CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCXL=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
# CONFIG_OMFS_FS is not set
CONFIG_OPAL_PRD=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 3fd28437a..1e86c3859 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3638,7 +3638,7 @@ CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCXL=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
# CONFIG_OMFS_FS is not set
CONFIG_OPAL_PRD=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index e3452e082..6118269bc 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3605,7 +3605,7 @@ CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCXL=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
# CONFIG_OMFS_FS is not set
CONFIG_OPAL_PRD=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 1ceeccc9e..3f6efcbd5 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3582,7 +3582,7 @@ CONFIG_OCFS2_FS_O2CB=m
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
CONFIG_OCXL=m
# CONFIG_OF_OVERLAY is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OF_UNITTEST is not set
# CONFIG_OMFS_FS is not set
CONFIG_OPAL_PRD=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 75eccd295..d17179af3 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3541,7 +3541,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OMFS_FS is not set
CONFIG_OPENVSWITCH_GENEVE=m
CONFIG_OPENVSWITCH_GRE=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index ae4361772..2fb107362 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3518,7 +3518,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OMFS_FS is not set
CONFIG_OPENVSWITCH_GENEVE=m
CONFIG_OPENVSWITCH_GRE=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index de92d86ab..38583172b 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3910,7 +3910,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OMFS_FS is not set
CONFIG_OPENVSWITCH_GENEVE=m
CONFIG_OPENVSWITCH_GRE=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 710a89eeb..54cfebb3d 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3889,7 +3889,7 @@ CONFIG_OCFS2_FS_O2CB=m
# CONFIG_OCFS2_FS_STATS is not set
CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
# CONFIG_OF is not set
-CONFIG_OF_PMEM=y
+CONFIG_OF_PMEM=m
# CONFIG_OMFS_FS is not set
CONFIG_OPENVSWITCH_GENEVE=m
CONFIG_OPENVSWITCH_GRE=m
diff --git a/kernel.spec b/kernel.spec
index 69cc9cc46..a4b317c44 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -75,9 +75,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 1
+%global rcrev 2
# The git snapshot level
-%define gitrev 3
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -597,6 +597,9 @@ Patch303: qcom-msm89xx-fixes.patch
# https://patchwork.kernel.org/patch/10173115/
Patch304: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch
+# https://patchwork.kernel.org/patch/10351797/
+Patch305: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
+
# https://marc.info/?l=linux-kernel&m=152328880417846&w=2
Patch308: arm64-thunderx-crypto-zip-fixes.patch
@@ -1889,6 +1892,15 @@ fi
#
#
%changelog
+* Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc2.git0.1
+- Linux v4.17-rc2
+
+* Mon Apr 23 2018 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Sun Apr 22 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add quirk patch to fix X-Gene 1 console on HP m400/Mustang (RHBZ 1531140)
+
* Fri Apr 20 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc1.git3.1
- Linux v4.17-rc1-93-g43f70c960180
diff --git a/sources b/sources
index 270607809..1a7daa560 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
SHA512 (linux-4.16.tar.xz) = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
-SHA512 (patch-4.17-rc1.xz) = a66f90c43b2855142711e80f2df61366bdb5dbe0ed257f549b36bb173f5f24fa87b6293ac284d00cb3c92f5708dbed5214313f8a31c6a98fa5cad29db9d4ad25
-SHA512 (patch-4.17-rc1-git3.xz) = b7b9cda1493e3598eb03f0c24170ce42576d4e2958f316710d3a17854b6c3ee312919e3b7bd19a9bedf9e750dbe4319c43409b3c57d5e77ab5bb0c830824b75c
+SHA512 (patch-4.17-rc2.xz) = 9456b16b16dc389b7f53cef01078b537557bbf28fb3a0ce286fbfef1605eb498c966dd98cff9e98eb772598c39b2e62643b3ef591112dbb8eb2ec06cbd18c7c6