Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc7.git0.1.vanilla.knurd.1.fc25

25 files changed, 156 insertions, 571 deletions

diff --git a/0001-Enable-AXP288-PMIC-support-on-x86_64-for-battery-cha.patch b/0001-Enable-AXP288-PMIC-support-on-x86_64-for-battery-cha.patch
deleted file mode 100644
index ce1573dcc..000000000
--- a/0001-Enable-AXP288-PMIC-support-on-x86_64-for-battery-cha.patch
+++ /dev/null
@@ -1,546 +0,0 @@
-From 7a434df40dcabc68902502994faf652936493e51 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Wed, 14 Jun 2017 17:30:36 +0200
-Subject: [RFC PATCH] Enable AXP288 PMIC support on x86_64 for battery charging
- and monitoring   support on Bay and Cherry Trail tablets and laptops Enable
- various drivers for peripherals found on Bay and Cherry Trail tablets
-
----
- baseconfig/x86/x86_64/CONFIG_AK8975                |  1 +
- baseconfig/x86/x86_64/CONFIG_AXP20X_ADC            |  1 +
- baseconfig/x86/x86_64/CONFIG_AXP20X_POWER          |  1 +
- baseconfig/x86/x86_64/CONFIG_AXP288_ADC            |  1 +
- baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER        |  1 +
- baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE     |  1 +
- baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042      |  1 +
- baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190       |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON                |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288         |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO           |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496  |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355        |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A        |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502         |  1 +
- baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO       |  1 +
- baseconfig/x86/x86_64/CONFIG_GPIO_AXP209           |  1 +
- baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_CORE   |  1 +
- baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI    |  1 +
- .../x86/x86_64/CONFIG_I2C_DESIGNWARE_PLATFORM      |  1 +
- baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK      |  1 +
- baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C       |  1 +
- baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO       |  1 +
- baseconfig/x86/x86_64/CONFIG_MFD_AXP20X            |  1 +
- baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C        |  1 +
- baseconfig/x86/x86_64/CONFIG_SILEAD_DMI            |  1 +
- baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM     |  1 +
- baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION  |  1 +
- kernel-x86_64-debug.config                         | 39 ++++++++++++++--------
- kernel-x86_64.config                               | 39 ++++++++++++++--------
- kernel.spec                                        |  5 +++
- 31 files changed, 85 insertions(+), 26 deletions(-)
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AK8975
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AXP288_ADC
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
- create mode 100644 baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
- create mode 100644 baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
- create mode 100644 baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502
- create mode 100644 baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO
- create mode 100644 baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
- create mode 100644 baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_CORE
- create mode 100644 baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
- create mode 100644 baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PLATFORM
- create mode 100644 baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
- create mode 100644 baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
- create mode 100644 baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
- create mode 100644 baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
- create mode 100644 baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
- create mode 100644 baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
- create mode 100644 baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
- create mode 100644 baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
-
-diff --git a/baseconfig/x86/x86_64/CONFIG_AK8975 b/baseconfig/x86/x86_64/CONFIG_AK8975
-new file mode 100644
-index 00000000..547c21a9
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AK8975
-@@ -0,0 +1 @@
-+CONFIG_AK8975=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC b/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
-new file mode 100644
-index 00000000..0960ee66
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AXP20X_ADC
-@@ -0,0 +1 @@
-+# CONFIG_AXP20X_ADC is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER b/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
-new file mode 100644
-index 00000000..e02cee70
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AXP20X_POWER
-@@ -0,0 +1 @@
-+# CONFIG_AXP20X_POWER is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_ADC b/baseconfig/x86/x86_64/CONFIG_AXP288_ADC
-new file mode 100644
-index 00000000..e138f36a
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AXP288_ADC
-@@ -0,0 +1 @@
-+CONFIG_AXP288_ADC=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER b/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
-new file mode 100644
-index 00000000..0418f962
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AXP288_CHARGER
-@@ -0,0 +1 @@
-+CONFIG_AXP288_CHARGER=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE b/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
-new file mode 100644
-index 00000000..e171b954
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_AXP288_FUEL_GAUGE
-@@ -0,0 +1 @@
-+CONFIG_AXP288_FUEL_GAUGE=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042 b/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
-new file mode 100644
-index 00000000..669e6ac2
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_BATTERY_MAX17042
-@@ -0,0 +1 @@
-+CONFIG_BATTERY_MAX17042=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190 b/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
-new file mode 100644
-index 00000000..3128bb67
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_CHARGER_BQ24190
-@@ -0,0 +1 @@
-+CONFIG_CHARGER_BQ24190=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON b/baseconfig/x86/x86_64/CONFIG_EXTCON
-new file mode 100644
-index 00000000..0a7190c0
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON
-@@ -0,0 +1 @@
-+CONFIG_EXTCON=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288 b/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
-new file mode 100644
-index 00000000..7fadeb58
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_AXP288
-@@ -0,0 +1 @@
-+CONFIG_EXTCON_AXP288=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO b/baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO
-new file mode 100644
-index 00000000..87ca2bd0
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_GPIO
-@@ -0,0 +1 @@
-+# CONFIG_EXTCON_GPIO is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496 b/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496
-new file mode 100644
-index 00000000..3f6c5d6f
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_INTEL_INT3496
-@@ -0,0 +1 @@
-+CONFIG_EXTCON_INTEL_INT3496=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355 b/baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355
-new file mode 100644
-index 00000000..680b5a77
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_MAX3355
-@@ -0,0 +1 @@
-+# CONFIG_EXTCON_MAX3355 is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A b/baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A
-new file mode 100644
-index 00000000..e5f7236c
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_RT8973A
-@@ -0,0 +1 @@
-+# CONFIG_EXTCON_RT8973A is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502 b/baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502
-new file mode 100644
-index 00000000..916994aa
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_SM5502
-@@ -0,0 +1 @@
-+# CONFIG_EXTCON_SM5502 is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO b/baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO
-new file mode 100644
-index 00000000..7a0c9af3
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_EXTCON_USB_GPIO
-@@ -0,0 +1 @@
-+# CONFIG_EXTCON_USB_GPIO is not set
-diff --git a/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209 b/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
-new file mode 100644
-index 00000000..2365ae70
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_GPIO_AXP209
-@@ -0,0 +1 @@
-+CONFIG_GPIO_AXP209=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_CORE b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_CORE
-new file mode 100644
-index 00000000..f9cdc633
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_CORE
-@@ -0,0 +1 @@
-+CONFIG_I2C_DESIGNWARE_CORE=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
-new file mode 100644
-index 00000000..6103f947
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PCI
-@@ -0,0 +1 @@
-+CONFIG_I2C_DESIGNWARE_PCI=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PLATFORM b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PLATFORM
-new file mode 100644
-index 00000000..3d50a3e8
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_I2C_DESIGNWARE_PLATFORM
-@@ -0,0 +1 @@
-+CONFIG_I2C_DESIGNWARE_PLATFORM=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK b/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
-new file mode 100644
-index 00000000..e2fbdf90
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_INPUT_AXP20X_PEK
-@@ -0,0 +1 @@
-+CONFIG_INPUT_AXP20X_PEK=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
-new file mode 100644
-index 00000000..8ec049b0
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_I2C
-@@ -0,0 +1 @@
-+CONFIG_INV_MPU6050_I2C=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
-new file mode 100644
-index 00000000..ae4889d9
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_INV_MPU6050_IIO
-@@ -0,0 +1 @@
-+CONFIG_INV_MPU6050_IIO=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
-new file mode 100644
-index 00000000..ada79c0d
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X
-@@ -0,0 +1 @@
-+CONFIG_MFD_AXP20X=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
-new file mode 100644
-index 00000000..22c60295
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_MFD_AXP20X_I2C
-@@ -0,0 +1 @@
-+CONFIG_MFD_AXP20X_I2C=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI b/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
-new file mode 100644
-index 00000000..25b01735
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_SILEAD_DMI
-@@ -0,0 +1 @@
-+CONFIG_SILEAD_DMI=y
-diff --git a/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM b/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
-new file mode 100644
-index 00000000..060ebfc9
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_USB_XHCI_PLATFORM
-@@ -0,0 +1 @@
-+CONFIG_USB_XHCI_PLATFORM=m
-diff --git a/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION b/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
-new file mode 100644
-index 00000000..8c98df14
---- /dev/null
-+++ b/baseconfig/x86/x86_64/CONFIG_XPOWER_PMIC_OPREGION
-@@ -0,0 +1 @@
-+CONFIG_XPOWER_PMIC_OPREGION=y
-diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
-index 08b52a89..d8d38c8e 100644
---- a/kernel-x86_64-debug.config
-+++ b/kernel-x86_64-debug.config
-@@ -192,7 +192,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
- CONFIG_AIX_PARTITION=y
- # CONFIG_AK09911 is not set
- # CONFIG_AK8974 is not set
--# CONFIG_AK8975 is not set
-+CONFIG_AK8975=m
- # CONFIG_AL3320A is not set
- CONFIG_ALIENWARE_WMI=m
- CONFIG_ALI_FIR=m
-@@ -326,6 +326,11 @@ CONFIG_AUXDISPLAY=y
- # CONFIG_AVERAGE is not set
- CONFIG_AX25_DAMA_SLAVE=y
- CONFIG_AX25=m
-+# CONFIG_AXP20X_ADC is not set
-+# CONFIG_AXP20X_POWER is not set
-+CONFIG_AXP288_ADC=m
-+CONFIG_AXP288_CHARGER=m
-+CONFIG_AXP288_FUEL_GAUGE=m
- CONFIG_B43_BCMA_PIO=y
- CONFIG_B43_BCMA=y
- CONFIG_B43_DEBUG=y
-@@ -385,7 +390,7 @@ CONFIG_BATMAN_ADV_NC=y
- # CONFIG_BATTERY_GAUGE_LTC2941 is not set
- # CONFIG_BATTERY_LEGO_EV3 is not set
- # CONFIG_BATTERY_MAX17040 is not set
--# CONFIG_BATTERY_MAX17042 is not set
-+CONFIG_BATTERY_MAX17042=m
- # CONFIG_BATTERY_SBS is not set
- CONFIG_BAYCOM_EPP=m
- CONFIG_BAYCOM_PAR=m
-@@ -699,7 +704,7 @@ CONFIG_CGROUP_PIDS=y
- CONFIG_CGROUP_SCHED=y
- CONFIG_CGROUPS=y
- # CONFIG_CHARGER_BQ2415X is not set
--# CONFIG_CHARGER_BQ24190 is not set
-+CONFIG_CHARGER_BQ24190=m
- # CONFIG_CHARGER_BQ24257 is not set
- # CONFIG_CHARGER_BQ24735 is not set
- # CONFIG_CHARGER_BQ25890 is not set
-@@ -1397,10 +1402,16 @@ CONFIG_EXT4_FS_SECURITY=y
- CONFIG_EXT4_FS=y
- CONFIG_EXT4_USE_FOR_EXT2=y
- # CONFIG_EXTCON_ADC_JACK is not set
-+CONFIG_EXTCON_AXP288=m
-+# CONFIG_EXTCON_GPIO is not set
- CONFIG_EXTCON_INTEL_CHT_WC=y
- CONFIG_EXTCON_INTEL_INT3496=m
--# CONFIG_EXTCON is not set
-+CONFIG_EXTCON=m
-+# CONFIG_EXTCON_MAX3355 is not set
- # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-+# CONFIG_EXTCON_RT8973A is not set
-+# CONFIG_EXTCON_SM5502 is not set
-+# CONFIG_EXTCON_USB_GPIO is not set
- CONFIG_EXTRA_FIRMWARE=""
- # CONFIG_EZNPS_GIC is not set
- # CONFIG_EZX_PCAP is not set
-@@ -1617,6 +1628,7 @@ CONFIG_GIRBIL_DONGLE=m
- # CONFIG_GPIO_ALTERA is not set
- # CONFIG_GPIO_AMD8111 is not set
- # CONFIG_GPIO_AMDPT is not set
-+CONFIG_GPIO_AXP209=m
- # CONFIG_GPIO_BT8XX is not set
- CONFIG_GPIO_CRYSTAL_COVE=y
- # CONFIG_GPIO_CS5535 is not set
-@@ -1903,10 +1915,10 @@ CONFIG_I2C_COMPAT=y
- # CONFIG_I2C_DEBUG_CORE is not set
- # CONFIG_I2C_DEMUX_PINCTRL is not set
- CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
--CONFIG_I2C_DESIGNWARE_CORE=m
-+CONFIG_I2C_DESIGNWARE_CORE=y
- # CONFIG_I2C_DESIGNWARE is not set
--CONFIG_I2C_DESIGNWARE_PCI=m
--CONFIG_I2C_DESIGNWARE_PLATFORM=m
-+CONFIG_I2C_DESIGNWARE_PCI=y
-+CONFIG_I2C_DESIGNWARE_PLATFORM=y
- CONFIG_I2C_DIOLAN_U2C=m
- # CONFIG_I2C_EG20T is not set
- # CONFIG_I2C_EMEV2 is not set
-@@ -2086,6 +2098,7 @@ CONFIG_INPUT_APANEL=m
- CONFIG_INPUT_ATI_REMOTE2=m
- CONFIG_INPUT_ATLAS_BTNS=m
- # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-+CONFIG_INPUT_AXP20X_PEK=m
- # CONFIG_INPUT_BMA150 is not set
- CONFIG_INPUT_CM109=m
- CONFIG_INPUT_CMA3000_I2C=m
-@@ -2184,8 +2197,8 @@ CONFIG_INTEL_TXT=y
- CONFIG_INTEL_VBTN=m
- CONFIG_INTEL_XWAY_PHY=m
- # CONFIG_INTERVAL_TREE_TEST is not set
--# CONFIG_INV_MPU6050_I2C is not set
--# CONFIG_INV_MPU6050_IIO is not set
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_INV_MPU6050_IIO=m
- # CONFIG_INV_MPU6050_SPI is not set
- # CONFIG_IOMMU_DEBUG is not set
- # CONFIG_IOMMU_STRESS is not set
-@@ -2864,8 +2877,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
- # CONFIG_MFD_ASIC3 is not set
- # CONFIG_MFD_ATMEL_FLEXCOM is not set
- # CONFIG_MFD_ATMEL_HLCDC is not set
--# CONFIG_MFD_AXP20X_I2C is not set
--# CONFIG_MFD_AXP20X is not set
-+CONFIG_MFD_AXP20X_I2C=y
-+CONFIG_MFD_AXP20X=y
- # CONFIG_MFD_BCM590XX is not set
- CONFIG_MFD_CORE=y
- # CONFIG_MFD_CPCAP is not set
-@@ -4695,7 +4708,7 @@ CONFIG_SH_ETH=m
- # CONFIG_SIGMA is not set
- CONFIG_SIGMATEL_FIR=m
- CONFIG_SIGNED_PE_FILE_VERIFICATION=y
--# CONFIG_SILEAD_DMI is not set
-+CONFIG_SILEAD_DMI=y
- CONFIG_SIS190=m
- CONFIG_SIS900=m
- # CONFIG_SKFP is not set
-@@ -5731,7 +5744,7 @@ CONFIG_USB_WDM=m
- CONFIG_USB_WUSB_CBAF=m
- CONFIG_USB_WUSB=m
- CONFIG_USB_XHCI_HCD=y
--# CONFIG_USB_XHCI_PLATFORM is not set
-+CONFIG_USB_XHCI_PLATFORM=m
- CONFIG_USB_XUSBATM=m
- CONFIG_USB=y
- CONFIG_USB_YUREX=m
-diff --git a/kernel-x86_64.config b/kernel-x86_64.config
-index 9fedd204..abcc8bb4 100644
---- a/kernel-x86_64.config
-+++ b/kernel-x86_64.config
-@@ -192,7 +192,7 @@ CONFIG_AIC7XXX_RESET_DELAY_MS=15000
- CONFIG_AIX_PARTITION=y
- # CONFIG_AK09911 is not set
- # CONFIG_AK8974 is not set
--# CONFIG_AK8975 is not set
-+CONFIG_AK8975=m
- # CONFIG_AL3320A is not set
- CONFIG_ALIENWARE_WMI=m
- CONFIG_ALI_FIR=m
-@@ -325,6 +325,11 @@ CONFIG_AUXDISPLAY=y
- # CONFIG_AVERAGE is not set
- CONFIG_AX25_DAMA_SLAVE=y
- CONFIG_AX25=m
-+# CONFIG_AXP20X_ADC is not set
-+# CONFIG_AXP20X_POWER is not set
-+CONFIG_AXP288_ADC=m
-+CONFIG_AXP288_CHARGER=m
-+CONFIG_AXP288_FUEL_GAUGE=m
- CONFIG_B43_BCMA_PIO=y
- CONFIG_B43_BCMA=y
- CONFIG_B43_DEBUG=y
-@@ -384,7 +389,7 @@ CONFIG_BATMAN_ADV_NC=y
- # CONFIG_BATTERY_GAUGE_LTC2941 is not set
- # CONFIG_BATTERY_LEGO_EV3 is not set
- # CONFIG_BATTERY_MAX17040 is not set
--# CONFIG_BATTERY_MAX17042 is not set
-+CONFIG_BATTERY_MAX17042=m
- # CONFIG_BATTERY_SBS is not set
- CONFIG_BAYCOM_EPP=m
- CONFIG_BAYCOM_PAR=m
-@@ -698,7 +703,7 @@ CONFIG_CGROUP_PIDS=y
- CONFIG_CGROUP_SCHED=y
- CONFIG_CGROUPS=y
- # CONFIG_CHARGER_BQ2415X is not set
--# CONFIG_CHARGER_BQ24190 is not set
-+CONFIG_CHARGER_BQ24190=m
- # CONFIG_CHARGER_BQ24257 is not set
- # CONFIG_CHARGER_BQ24735 is not set
- # CONFIG_CHARGER_BQ25890 is not set
-@@ -1386,10 +1391,16 @@ CONFIG_EXT4_FS_SECURITY=y
- CONFIG_EXT4_FS=y
- CONFIG_EXT4_USE_FOR_EXT2=y
- # CONFIG_EXTCON_ADC_JACK is not set
-+CONFIG_EXTCON_AXP288=m
-+# CONFIG_EXTCON_GPIO is not set
- CONFIG_EXTCON_INTEL_CHT_WC=y
- CONFIG_EXTCON_INTEL_INT3496=m
--# CONFIG_EXTCON is not set
-+CONFIG_EXTCON=m
-+# CONFIG_EXTCON_MAX3355 is not set
- # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
-+# CONFIG_EXTCON_RT8973A is not set
-+# CONFIG_EXTCON_SM5502 is not set
-+# CONFIG_EXTCON_USB_GPIO is not set
- CONFIG_EXTRA_FIRMWARE=""
- # CONFIG_EZNPS_GIC is not set
- # CONFIG_EZX_PCAP is not set
-@@ -1599,6 +1610,7 @@ CONFIG_GIRBIL_DONGLE=m
- # CONFIG_GPIO_ALTERA is not set
- # CONFIG_GPIO_AMD8111 is not set
- # CONFIG_GPIO_AMDPT is not set
-+CONFIG_GPIO_AXP209=m
- # CONFIG_GPIO_BT8XX is not set
- CONFIG_GPIO_CRYSTAL_COVE=y
- # CONFIG_GPIO_CS5535 is not set
-@@ -1885,10 +1897,10 @@ CONFIG_I2C_COMPAT=y
- # CONFIG_I2C_DEBUG_CORE is not set
- # CONFIG_I2C_DEMUX_PINCTRL is not set
- CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
--CONFIG_I2C_DESIGNWARE_CORE=m
-+CONFIG_I2C_DESIGNWARE_CORE=y
- # CONFIG_I2C_DESIGNWARE is not set
--CONFIG_I2C_DESIGNWARE_PCI=m
--CONFIG_I2C_DESIGNWARE_PLATFORM=m
-+CONFIG_I2C_DESIGNWARE_PCI=y
-+CONFIG_I2C_DESIGNWARE_PLATFORM=y
- CONFIG_I2C_DIOLAN_U2C=m
- # CONFIG_I2C_EG20T is not set
- # CONFIG_I2C_EMEV2 is not set
-@@ -2068,6 +2080,7 @@ CONFIG_INPUT_APANEL=m
- CONFIG_INPUT_ATI_REMOTE2=m
- CONFIG_INPUT_ATLAS_BTNS=m
- # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
-+CONFIG_INPUT_AXP20X_PEK=m
- # CONFIG_INPUT_BMA150 is not set
- CONFIG_INPUT_CM109=m
- CONFIG_INPUT_CMA3000_I2C=m
-@@ -2166,8 +2179,8 @@ CONFIG_INTEL_TXT=y
- CONFIG_INTEL_VBTN=m
- CONFIG_INTEL_XWAY_PHY=m
- # CONFIG_INTERVAL_TREE_TEST is not set
--# CONFIG_INV_MPU6050_I2C is not set
--# CONFIG_INV_MPU6050_IIO is not set
-+CONFIG_INV_MPU6050_I2C=m
-+CONFIG_INV_MPU6050_IIO=m
- # CONFIG_INV_MPU6050_SPI is not set
- # CONFIG_IOMMU_DEBUG is not set
- # CONFIG_IOMMU_STRESS is not set
-@@ -2844,8 +2857,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
- # CONFIG_MFD_ASIC3 is not set
- # CONFIG_MFD_ATMEL_FLEXCOM is not set
- # CONFIG_MFD_ATMEL_HLCDC is not set
--# CONFIG_MFD_AXP20X_I2C is not set
--# CONFIG_MFD_AXP20X is not set
-+CONFIG_MFD_AXP20X_I2C=y
-+CONFIG_MFD_AXP20X=y
- # CONFIG_MFD_BCM590XX is not set
- CONFIG_MFD_CORE=y
- # CONFIG_MFD_CPCAP is not set
-@@ -4674,7 +4687,7 @@ CONFIG_SH_ETH=m
- # CONFIG_SIGMA is not set
- CONFIG_SIGMATEL_FIR=m
- CONFIG_SIGNED_PE_FILE_VERIFICATION=y
--# CONFIG_SILEAD_DMI is not set
-+CONFIG_SILEAD_DMI=y
- CONFIG_SIS190=m
- CONFIG_SIS900=m
- # CONFIG_SKFP is not set
-@@ -5709,7 +5722,7 @@ CONFIG_USB_WDM=m
- CONFIG_USB_WUSB_CBAF=m
- CONFIG_USB_WUSB=m
- CONFIG_USB_XHCI_HCD=y
--# CONFIG_USB_XHCI_PLATFORM is not set
-+CONFIG_USB_XHCI_PLATFORM=m
- CONFIG_USB_XUSBATM=m
- CONFIG_USB=y
- CONFIG_USB_YUREX=m
-diff --git a/kernel.spec b/kernel.spec
-index 3cb67fd1..6d93d2a7 100644
---- a/kernel.spec
-+++ b/kernel.spec
-@@ -2165,6 +2165,11 @@ fi
- #
- #
- %changelog
-+* Wed Jun 14 2017 Hans de Goede <jwrdegoede@fedoraproject.org>
-+- Enable AXP288 PMIC support on x86_64 for battery charging and monitoring
-+  support on Bay and Cherry Trail tablets and laptops
-+- Enable various drivers for peripherals found on Bay and Cherry Trail tablets
-+
- * Mon Jun 12 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.12.0-0.rc5.git0.1
- - Linux v4.12-rc5
- - Disable debugging options.
--- 
-2.13.0
-
diff --git a/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch b/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch
new file mode 100644
index 000000000..540b925eb
--- /dev/null
+++ b/0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch
@@ -0,0 +1,46 @@
+From 37af97ef14c201b1db8dd341aabd262da23e48aa Mon Sep 17 00:00:00 2001
+From: Fedora Kernel Team <kernel-team@fedoraproject.org>
+Date: Mon, 30 Oct 2017 11:38:27 -0500
+Subject: [PATCH] [PATCH] staging: rtl8822be: fix wrong dma unmap len
+
+Patch fixes splat:
+
+r8822be 0000:04:00.0: DMA-API: device driver frees DMA memory with different size
+[device address=0x0000000078477000] [map size=4096 bytes] [unmap size=424 bytes]
+<snip>
+Call Trace:
+  debug_dma_unmap_page+0xa5/0xb0
+  ? unmap_single+0x2f/0x40
+  _rtl8822be_send_bcn_or_cmd_packet+0x2c5/0x300 [r8822be]
+  ? _rtl8822be_send_bcn_or_cmd_packet+0x2c5/0x300 [r8822be]
+  rtl8822b_halmac_cb_write_data_rsvd_page+0x51/0xc0 [r8822be]
+  _halmac_write_data_rsvd_page+0x22/0x30 [r8822be]
+  halmac_download_rsvd_page_88xx+0xee/0x1f0 [r8822be]
+  halmac_dlfw_to_mem_88xx+0x80/0x120 [r8822be]
+  halmac_download_firmware_88xx.part.47+0x477/0x600 [r8822be]
+  halmac_download_firmware_88xx+0x32/0x40 [r8822be]
+  rtl_halmac_dlfw+0x70/0x120 [r8822be]
+  rtl_halmac_init_hal+0x5f/0x1b0 [r8822be]
+  rtl8822be_hw_init+0x8a2/0x1040 [r8822be]
+
+Signed-off-by: Stanislaw Gruszka <sgruszka at redhat.com>
+---
+ drivers/staging/rtlwifi/rtl8822be/fw.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/rtlwifi/rtl8822be/fw.c b/drivers/staging/rtlwifi/rtl8822be/fw.c
+index 8e24da1..a2cc548 100644
+--- a/drivers/staging/rtlwifi/rtl8822be/fw.c
++++ b/drivers/staging/rtlwifi/rtl8822be/fw.c
+@@ -419,7 +419,7 @@ static bool _rtl8822be_send_bcn_or_cmd_packet(struct ieee80211_hw *hw,
+ 		dma_addr = rtlpriv->cfg->ops->get_desc(
+ 				hw, (u8 *)pbd_desc, true, HW_DESC_TXBUFF_ADDR);
+
+-		pci_unmap_single(rtlpci->pdev, dma_addr, skb->len,
++		pci_unmap_single(rtlpci->pdev, dma_addr, pskb->len,
+ 				 PCI_DMA_TODEVICE);
+ 		kfree_skb(pskb);
+
+-- 
+2.13.6
+
diff --git a/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch b/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
new file mode 100644
index 000000000..2242e2d44
--- /dev/null
+++ b/0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
@@ -0,0 +1,72 @@
+From 0e9df6a74f9573409e5a2fbe29c1389188280bfc Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede@redhat.com>
+Date: Thu, 5 Oct 2017 16:02:33 +0200
+Subject: [PATCH] platform/x86: peaq-wmi: Add DMI check before binding to the
+ WMI interface
+
+It seems that the WMI GUID used by the PEAQ 2-in-1 WMI hotkeys is not
+as unique as a GUID should be and is used on some other devices too.
+
+This is causing spurious key-press reports on these other devices.
+
+This commits adds a DMI check to the PEAQ 2-in-1 WMI hotkeys driver to
+ensure that it is actually running on a PEAQ 2-in-1, fixing the
+spurious key-presses on these other devices.
+
+BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1497861
+BugLink: https://bugzilla.suse.com/attachment.cgi?id=743182
+Cc: stable@vger.kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ drivers/platform/x86/peaq-wmi.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/drivers/platform/x86/peaq-wmi.c b/drivers/platform/x86/peaq-wmi.c
+index bc98ef95514a..67fa3fa32011 100644
+--- a/drivers/platform/x86/peaq-wmi.c
++++ b/drivers/platform/x86/peaq-wmi.c
+@@ -8,6 +8,7 @@
+  */
+ 
+ #include <linux/acpi.h>
++#include <linux/dmi.h>
+ #include <linux/input-polldev.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+@@ -64,8 +65,23 @@ static void peaq_wmi_poll(struct input_polled_dev *dev)
+ 	}
+ }
+ 
++/* Some other devices (Shuttle XS35) use the same WMI GUID for other purposes */
++static const struct dmi_system_id peaq_dmi_table[] = {
++	{
++		.matches = {
++			DMI_MATCH(DMI_SYS_VENDOR, "PEAQ"),
++			DMI_MATCH(DMI_PRODUCT_NAME, "PEAQ PMM C1010 MD99187"),
++		},
++	},
++	{}
++};
++
+ static int __init peaq_wmi_init(void)
+ {
++	/* WMI GUID is not unique, also check for a DMI match */
++	if (!dmi_check_system(peaq_dmi_table))
++		return -ENODEV;
++
+ 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
+ 		return -ENODEV;
+ 
+@@ -86,6 +101,9 @@ static int __init peaq_wmi_init(void)
+ 
+ static void __exit peaq_wmi_exit(void)
+ {
++	if (!dmi_check_system(peaq_dmi_table))
++		return;
++
+ 	if (!wmi_has_guid(PEAQ_DOLBY_BUTTON_GUID))
+ 		return;
+ 
+-- 
+2.14.2
+
diff --git a/baseconfig/CONFIG_R8822BE b/baseconfig/CONFIG_R8822BE
index 8f375f0d2..2f7c08787 100644
--- a/baseconfig/CONFIG_R8822BE
+++ b/baseconfig/CONFIG_R8822BE
@@ -1 +1 @@
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
diff --git a/gitrev b/gitrev
index 0398105b5..800cfe931 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-15f859ae5c43c7f0a064ed92d33f7a5bc5de6de0
+0b07194bb55ed836c2cc7c22e866b87a14681984
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 0a06ce464..a92c6a9e8 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4279,7 +4279,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index f5124a607..0d223ce97 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4257,7 +4257,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 7303ae431..427d22340 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4595,7 +4595,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index f929ab7e1..146f5acf4 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4319,7 +4319,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index d4cedf056..4416f1616 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4297,7 +4297,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index aac5ec7d5..0603a0142 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4573,7 +4573,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 6710ac7cd..c0d237f43 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -4069,7 +4069,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 972c156fa..4fdebfb9c 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -4090,7 +4090,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index feba8af30..b36877807 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4090,7 +4090,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 4b11316d2..dcfa25f71 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4069,7 +4069,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index f9e551df9..1c4cbb306 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -3902,7 +3902,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 119fbb80e..5ad56bb3f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -3879,7 +3879,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2d669bce2..38c4c750e 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3841,7 +3841,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index beb2209fd..8d278242d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3818,7 +3818,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 52dedb01c..d672f1f1a 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3736,7 +3736,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index eff8ee098..e76dd83ed 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -3713,7 +3713,7 @@ CONFIG_R8169=m
 # CONFIG_R8188EU is not set
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 189c658b6..408542ba2 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4131,7 +4131,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 89ef72d3a..70eef4e26 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4110,7 +4110,7 @@ CONFIG_R8169=m
 CONFIG_R8188EU=m
 CONFIG_R8712U=m
 CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162)
-# CONFIG_R8822BE is not set
+CONFIG_R8822BE=m
 CONFIG_RADIO_ADAPTERS=y
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_CADET=m
diff --git a/kernel.spec b/kernel.spec
index 1e8a2f5ca..2b6f3c8ec 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 6
+%global rcrev 7
 # The git snapshot level
-%define gitrev 4
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 
 # Want to build a vanilla kernel build without any non-upstream patches?
 %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -675,6 +675,11 @@ Patch620: 0001-staging-vboxvideo-Fix-reporting-invalid-suggested-of.patch
 # Headed upstream
 Patch621: drm-i915-Boost-GPU-clocks-if-we-miss-the-pageflip-s-vblank.patch
 
+# rhbz 1497861, submitted upstream, Cc: Stable
+Patch622: 0001-platform-x86-peaq-wmi-Add-DMI-check-before-binding-t.patch
+
+Patch623: 0001-PATCH-staging-rtl8822be-fix-wrong-dma-unmap-len.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2232,6 +2237,15 @@ fi
 #
 #
 %changelog
+* Mon Oct 30 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc7.git0.1
+- Linux v4.14-rc7
+
+* Mon Oct 30 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
+* Mon Oct 30 2017 Hans de Goede <jwrdegoede@fedoraproject.org>
+- Fix for peaq_wmi nul spew (rhbz 1497861)
+
 * Fri Oct 27 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc6.git4.1
 - Linux v4.14-rc6-53-g15f859ae5c43
 
diff --git a/sources b/sources
index 33e7bef54..cb836c93d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
 SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
 SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
-SHA512 (patch-4.14-rc6.xz) = f10d13b0bd4f5e3bf295d4ef779cf358011e05c124b06277fef8afcf1a591b147f62717f0128866412fdd7ddddd660c0ae4b82b02b95702f10aabf50292c0ae7
-SHA512 (patch-4.14-rc6-git4.xz) = 353f5962e91fd364154540598fecd355080bf44d91cdde5fb9e0d18c073bcf291510e7a7d3fe9f53542cac23ee528e1608557e3fde34880dfd857f90da9f4cfc
+SHA512 (patch-4.14-rc7.xz) = 5b078e3c3342f814dc250ac93272262b161b6ec763f76e78314ecff34e047c3db3f10a4764c3d9a15d62938fcdc18a5da76d18caa66ae5c38ae262363f7b73da