Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-10-10 16:36:27 +0200
committerTakashi Iwai <tiwai@suse.de>2018-10-10 16:36:27 +0200
commit1f84342b1f646b732cad06bd6d7b52206f215fd7 (patch)
tree6b984da292c7072a82406ce9347b6fee96c4a486
parent00e45486164c98f1134d75a029e7ebbb90304df7 (diff)
parent475398c7fb991406e091d6f62af804e20d08ae53 (diff)
Merge branch 'SLE12-SP3' into openSUSE-42.3rpm-4.4.159-73
Update configs too
-rw-r--r--blacklist.conf3
-rw-r--r--config/arm64/default5
-rw-r--r--config/arm64/vanilla1
-rw-r--r--config/armv7hl/default5
-rw-r--r--config/armv7hl/lpae5
-rw-r--r--config/armv7hl/vanilla1
-rw-r--r--config/ppc64le/debug2
-rw-r--r--config/ppc64le/default2
-rw-r--r--config/s390x/default2
-rw-r--r--config/s390x/zfcpdump2
-rw-r--r--config/x86_64/debug3
-rw-r--r--config/x86_64/default3
-rw-r--r--patches.drivers/0001-mmc-mmci-stop-building-qcom-dml-as-module.patch57
-rw-r--r--patches.drivers/0002-phy-qcom-ufs-add-MODULE_LICENSE-tag.patch45
-rw-r--r--patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch14
-rw-r--r--patches.drivers/watchdog-w83627hf_wdt-support-NCT6102.patch114
-rw-r--r--patches.fixes/0001-Revert-dma-buf-sync-file-Avoid-enable-fence-signalin.patch39
-rw-r--r--patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch36
-rw-r--r--patches.suse/dm-mpath-finally-fixup-cmd_flags.patch51
-rw-r--r--series.conf10
-rw-r--r--supported.conf2
21 files changed, 377 insertions, 25 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 44bff97c15..5ec9884655 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -486,3 +486,6 @@ e53db018315b7660bb7000a29e79faff2496c2c2 # dts fix
5ad356eabc47d26a92140a0c4b20eba471c10de3 # dup
828f193dd62a40ade5ea8b24cb8b0a22c30df673 # missing dependencies
28e2c4bb99aa40f9d5f07ac130cbc4da0ea93079 # SLE has a partial revert due to KABI constraints that also fix the issue
+cc51e5428ea54f575d49cfcede1d4cb3a72b4ec4 # warning fix only, breaks kABI
+dfa169bbee00671288df25f8ef8a2f6e13fe2581 # Only removes a feature from Intel-KVM, no bug fix
+9494ea90a56d013f4257686c8daf49203cd900c0 # Needs other patches before this makes sense
diff --git a/config/arm64/default b/config/arm64/default
index 0a0d4ee5d7..965c136db3 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.4.156 Kernel Configuration
+# Linux/arm64 4.4.159 Kernel Configuration
#
CONFIG_ARM64=y
CONFIG_64BIT=y
@@ -1376,7 +1376,6 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
@@ -5333,7 +5332,7 @@ CONFIG_SDIO_UART=m
# MMC/SD/SDIO Host Controller Drivers
#
CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
CONFIG_MMC_SDHCI_PCI=m
diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index 43cef13dbc..82b517dd77 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -13,6 +13,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_KVM_ARM_VGIC_V3=y
CONFIG_LOCALVERSION="-vanilla"
+CONFIG_MMC_QCOM_DML=m
CONFIG_MODULES=y
# CONFIG_MODULE_SIG is not set
CONFIG_EFI_STUB=y
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 7653aa998b..4c4fd42a5f 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.156 Kernel Configuration
+# Linux/arm 4.4.159 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1775,7 +1775,6 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
@@ -6461,7 +6460,7 @@ CONFIG_SDIO_UART=m
# MMC/SD/SDIO Host Controller Drivers
#
CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
# CONFIG_MMC_SDHCI_PCI is not set
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 4332806bdd..a30b71a65b 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.4.156 Kernel Configuration
+# Linux/arm 4.4.159 Kernel Configuration
#
CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1713,7 +1713,6 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
@@ -6160,7 +6159,7 @@ CONFIG_SDIO_UART=m
# MMC/SD/SDIO Host Controller Drivers
#
CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_QCOM_DML=m
+CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_IO_ACCESSORS=y
# CONFIG_MMC_SDHCI_PCI is not set
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index fa0381a507..c49607a1db 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -7,6 +7,7 @@ CONFIG_DM_CACHE_MQ=m
# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
CONFIG_HAVE_DMA_ATTRS=y
CONFIG_LOCALVERSION="-vanilla"
+CONFIG_MMC_QCOM_DML=m
# CONFIG_SATA_RCAR is not set
CONFIG_MODULES=y
# CONFIG_MODULE_SIG is not set
diff --git a/config/ppc64le/debug b/config/ppc64le/debug
index 9294875a68..3b0c3044fe 100644
--- a/config/ppc64le/debug
+++ b/config/ppc64le/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.141 Kernel Configuration
+# Linux/powerpc 4.4.159 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/ppc64le/default b/config/ppc64le/default
index bd64573dd3..6f504c6334 100644
--- a/config/ppc64le/default
+++ b/config/ppc64le/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.4.141 Kernel Configuration
+# Linux/powerpc 4.4.159 Kernel Configuration
#
CONFIG_PPC64=y
diff --git a/config/s390x/default b/config/s390x/default
index 04f6da898b..928551ae5c 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.4.141 Kernel Configuration
+# Linux/s390 4.4.159 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index b1e374eb17..5a64f81cdf 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/s390 4.4.141 Kernel Configuration
+# Linux/s390 4.4.159 Kernel Configuration
#
CONFIG_MMU=y
CONFIG_ZONE_DMA=y
diff --git a/config/x86_64/debug b/config/x86_64/debug
index 412db97f09..cd7748e6ba 100644
--- a/config/x86_64/debug
+++ b/config/x86_64/debug
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.4.156 Kernel Configuration
+# Linux/x86_64 4.4.159 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1620,7 +1620,6 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
diff --git a/config/x86_64/default b/config/x86_64/default
index e9de15ffb0..395746d6bb 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.4.156 Kernel Configuration
+# Linux/x86_64 4.4.159 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -1626,7 +1626,6 @@ CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
diff --git a/patches.drivers/0001-mmc-mmci-stop-building-qcom-dml-as-module.patch b/patches.drivers/0001-mmc-mmci-stop-building-qcom-dml-as-module.patch
new file mode 100644
index 0000000000..54bcc95526
--- /dev/null
+++ b/patches.drivers/0001-mmc-mmci-stop-building-qcom-dml-as-module.patch
@@ -0,0 +1,57 @@
+From 12e181ab4bc4c2060cc917af17ce3d4783e1dc00 Mon Sep 17 00:00:00 2001
+From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Date: Wed, 30 Aug 2017 14:22:12 +0200
+Subject: [PATCH 1/4] mmc: mmci: stop building qcom dml as module
+
+Git-commit: 1ac99066225bd0dab013f7a5f3c9f55453acd481
+Patch-mainline: v4.14-rc1
+References: bsc#1110468
+
+It does not make sense for qcom dml code to be a seperate module, as
+this has just 2 helper functions specific to qcom, and used directly by
+mmci driver, so just compile this along with main mmci driver.
+
+This would also fix issues arrising due to Kconfig combinations between
+mmci and qcom dml.
+
+Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ drivers/mmc/host/Kconfig | 2 +-
+ drivers/mmc/host/Makefile | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
+index 2db84dd664d7..5e03699e7031 100644
+--- a/drivers/mmc/host/Kconfig
++++ b/drivers/mmc/host/Kconfig
+@@ -15,7 +15,7 @@ config MMC_ARMMMCI
+ If unsure, say N.
+
+ config MMC_QCOM_DML
+- tristate "Qualcomm Data Mover for SD Card Controller"
++ bool "Qualcomm Data Mover for SD Card Controller"
+ depends on MMC_ARMMMCI && QCOM_BAM_DMA
+ default y
+ help
+diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
+index 926347c2eeb4..15d59968e9cb 100644
+--- a/drivers/mmc/host/Makefile
++++ b/drivers/mmc/host/Makefile
+@@ -2,8 +2,9 @@
+ # Makefile for MMC/SD host controller drivers
+ #
+
+-obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
+-obj-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o
++obj-$(CONFIG_MMC_ARMMMCI) += armmmci.o
++armmmci-y := mmci.o
++armmmci-$(CONFIG_MMC_QCOM_DML) += mmci_qcom_dml.o
+ obj-$(CONFIG_MMC_PXA) += pxamci.o
+ obj-$(CONFIG_MMC_MXC) += mxcmmc.o
+ obj-$(CONFIG_MMC_MXS) += mxs-mmc.o
+--
+2.11.0
+
diff --git a/patches.drivers/0002-phy-qcom-ufs-add-MODULE_LICENSE-tag.patch b/patches.drivers/0002-phy-qcom-ufs-add-MODULE_LICENSE-tag.patch
new file mode 100644
index 0000000000..45d1838c0c
--- /dev/null
+++ b/patches.drivers/0002-phy-qcom-ufs-add-MODULE_LICENSE-tag.patch
@@ -0,0 +1,45 @@
+From fcc28ba999e8f5c735c37afd2f04f383e5a4af8b Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 10 Jan 2018 17:35:43 +0100
+Subject: [PATCH 2/4] phy: qcom-ufs: add MODULE_LICENSE tag
+
+Git-commit: 59fba0869acae06ff594dd7e9808ed673f53538a
+Patch-mainline: v4.16-rc6
+References: bsc#1110468
+
+While the specific UFS PHY drivers (14nm and 20nm) have a module
+license, the common base module does not, leading to a Kbuild
+failure:
+
+WARNING: modpost: missing MODULE_LICENSE() in drivers/phy/qualcomm/phy-qcom-ufs.o
+FATAL: modpost: GPL-incompatible module phy-qcom-ufs.ko uses GPL-only symbol 'clk_enable'
+
+This adds a module description and license tag to fix the build.
+I added both Yaniv and Vivek as authors here, as Yaniv sent the initial
+submission, while Vivek did most of the work since.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
+Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
+Signed-off-by: Matthias Brugger <mbrugger@suse.com>
+---
+ drivers/phy/phy-qcom-ufs.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/drivers/phy/phy-qcom-ufs.c b/drivers/phy/phy-qcom-ufs.c
+index 43865ef340e2..3afba145f2e6 100644
+--- a/drivers/phy/phy-qcom-ufs.c
++++ b/drivers/phy/phy-qcom-ufs.c
+@@ -689,3 +689,8 @@ int ufs_qcom_phy_power_off(struct phy *generic_phy)
+ return 0;
+ }
+ EXPORT_SYMBOL_GPL(ufs_qcom_phy_power_off);
++
++MODULE_AUTHOR("Yaniv Gardi <ygardi@codeaurora.org>");
++MODULE_AUTHOR("Vivek Gautam <vivek.gautam@codeaurora.org>");
++MODULE_DESCRIPTION("Universal Flash Storage (UFS) QCOM PHY");
++MODULE_LICENSE("GPL v2");
+--
+2.11.0
+
diff --git a/patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch b/patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch
index bdadf89250..f5d09a7abf 100644
--- a/patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch
+++ b/patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch
@@ -25,16 +25,16 @@ Signed-off-by: Jean Delvare <jdelvare@suse.de>
#define WATCHDOG_NAME "w83627hf/thf/hg/dhg WDT"
#define WATCHDOG_TIMEOUT 60 /* 60 sec default timeout */
-@@ -47,6 +48,8 @@
- static int wdt_io;
+@@ -48,6 +49,8 @@ static int wdt_io;
static int cr_wdt_timeout; /* WDT timeout register */
static int cr_wdt_control; /* WDT control register */
+ static int cr_wdt_csr; /* WDT control & status register */
+static int wdt_cfg_enter = 0x87;/* key to unlock configuration space */
+static int wdt_cfg_leave = 0xAA;/* key to lock configuration space */
enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
-@@ -121,8 +124,8 @@ static int superio_enter(void)
+@@ -128,8 +131,8 @@ static int superio_enter(void)
if (!request_muxed_region(wdt_io, 2, WATCHDOG_NAME))
return -EBUSY;
@@ -45,7 +45,7 @@ Signed-off-by: Jean Delvare <jdelvare@suse.de>
return 0;
}
-@@ -134,7 +137,7 @@ static void superio_select(int ld)
+@@ -141,7 +144,7 @@ static void superio_select(int ld)
static void superio_exit(void)
{
@@ -54,7 +54,7 @@ Signed-off-by: Jean Delvare <jdelvare@suse.de>
release_region(wdt_io, 2);
}
-@@ -417,6 +420,34 @@ static int wdt_find(int addr)
+@@ -432,6 +435,34 @@ static int wdt_find(int addr)
return ret;
}
@@ -89,8 +89,8 @@ Signed-off-by: Jean Delvare <jdelvare@suse.de>
static int __init wdt_init(void)
{
int ret;
-@@ -442,6 +473,9 @@ static int __init wdt_init(void)
- "NCT6792",
+@@ -458,6 +489,9 @@ static int __init wdt_init(void)
+ "NCT6102",
};
+ /* Apply system-specific quirks */
diff --git a/patches.drivers/watchdog-w83627hf_wdt-support-NCT6102.patch b/patches.drivers/watchdog-w83627hf_wdt-support-NCT6102.patch
new file mode 100644
index 0000000000..58a5720fa6
--- /dev/null
+++ b/patches.drivers/watchdog-w83627hf_wdt-support-NCT6102.patch
@@ -0,0 +1,114 @@
+From: Rob Kramer <rob@solution-space.com>
+Date: Mon, 8 Feb 2016 18:09:49 +0800
+Subject: watchdog: w83627hf: Added NCT6102D support.
+Git-commit: 33f74b893a46448670f11375427f0084753c23b6
+Patch-mainline: v4.6
+References: bsc#1106434
+
+As used in (and tested on) the ASRock IMB-150 board. Implementation is
+identical to other NCT chips, just with different registers.
+
+Signed-off-by: Rob Kramer <rob@solution-space.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+---
+ drivers/watchdog/Kconfig | 1 +
+ drivers/watchdog/w83627hf_wdt.c | 22 +++++++++++++++++++---
+ 2 files changed, 20 insertions(+), 3 deletions(-)
+
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -1083,6 +1083,7 @@ config W83627HF_WDT
+ NCT6779
+ NCT6791
+ NCT6792
++ NCT6102D/04D/06D
+
+ This watchdog simply watches your kernel to make sure it doesn't
+ freeze, and if it does, it reboots your computer after a certain
+--- a/drivers/watchdog/w83627hf_wdt.c
++++ b/drivers/watchdog/w83627hf_wdt.c
+@@ -47,10 +47,11 @@
+ static int wdt_io;
+ static int cr_wdt_timeout; /* WDT timeout register */
+ static int cr_wdt_control; /* WDT control register */
++static int cr_wdt_csr; /* WDT control & status register */
+
+ enum chips { w83627hf, w83627s, w83697hf, w83697ug, w83637hf, w83627thf,
+ w83687thf, w83627ehf, w83627dhg, w83627uhg, w83667hg, w83627dhg_p,
+- w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792 };
++ w83667hg_b, nct6775, nct6776, nct6779, nct6791, nct6792, nct6102 };
+
+ static int timeout; /* in seconds */
+ module_param(timeout, int, 0);
+@@ -94,15 +95,21 @@ MODULE_PARM_DESC(early_disable, "Disable
+ #define W83667HG_B_ID 0xb3
+ #define NCT6775_ID 0xb4
+ #define NCT6776_ID 0xc3
++#define NCT6102_ID 0xc4
+ #define NCT6779_ID 0xc5
+ #define NCT6791_ID 0xc8
+ #define NCT6792_ID 0xc9
+
+ #define W83627HF_WDT_TIMEOUT 0xf6
+ #define W83697HF_WDT_TIMEOUT 0xf4
++#define NCT6102D_WDT_TIMEOUT 0xf1
+
+ #define W83627HF_WDT_CONTROL 0xf5
+ #define W83697HF_WDT_CONTROL 0xf3
++#define NCT6102D_WDT_CONTROL 0xf0
++
++#define W836X7HF_WDT_CSR 0xf7
++#define NCT6102D_WDT_CSR 0xf2
+
+ static void superio_outb(int reg, int val)
+ {
+@@ -199,6 +206,7 @@ static int w83627hf_init(struct watchdog
+ case nct6779:
+ case nct6791:
+ case nct6792:
++ case nct6102:
+ /*
+ * These chips have a fixed WDTO# output pin (W83627UHG),
+ * or support more than one WDTO# output pin.
+@@ -231,8 +239,8 @@ static int w83627hf_init(struct watchdog
+ superio_outb(cr_wdt_control, t);
+
+ /* reset trigger, disable keyboard & mouse turning off watchdog */
+- t = superio_inb(0xF7) & ~0xD0;
+- superio_outb(0xF7, t);
++ t = superio_inb(cr_wdt_csr) & ~0xD0;
++ superio_outb(cr_wdt_csr, t);
+
+ superio_exit();
+
+@@ -340,6 +348,7 @@ static int wdt_find(int addr)
+
+ cr_wdt_timeout = W83627HF_WDT_TIMEOUT;
+ cr_wdt_control = W83627HF_WDT_CONTROL;
++ cr_wdt_csr = W836X7HF_WDT_CSR;
+
+ ret = superio_enter();
+ if (ret)
+@@ -405,6 +414,12 @@ static int wdt_find(int addr)
+ case NCT6792_ID:
+ ret = nct6792;
+ break;
++ case NCT6102_ID:
++ ret = nct6102;
++ cr_wdt_timeout = NCT6102D_WDT_TIMEOUT;
++ cr_wdt_control = NCT6102D_WDT_CONTROL;
++ cr_wdt_csr = NCT6102D_WDT_CSR;
++ break;
+ case 0xff:
+ ret = -ENODEV;
+ break;
+@@ -440,6 +455,7 @@ static int __init wdt_init(void)
+ "NCT6779",
+ "NCT6791",
+ "NCT6792",
++ "NCT6102",
+ };
+
+ wdt_io = 0x2e;
diff --git a/patches.fixes/0001-Revert-dma-buf-sync-file-Avoid-enable-fence-signalin.patch b/patches.fixes/0001-Revert-dma-buf-sync-file-Avoid-enable-fence-signalin.patch
new file mode 100644
index 0000000000..3aa01c9b35
--- /dev/null
+++ b/patches.fixes/0001-Revert-dma-buf-sync-file-Avoid-enable-fence-signalin.patch
@@ -0,0 +1,39 @@
+From 069cad6d02fef7924fb942b37a6c17dd02a79f7f Mon Sep 17 00:00:00 2001
+From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+Date: Fri, 18 Nov 2016 17:26:43 +0900
+Subject: [PATCH] Revert "dma-buf/sync-file: Avoid enable fence signaling if
+ poll(.timeout=0)"
+References: bsc#1111363
+Patch-mainline: v4.9-rc4
+Git-commit: 069cad6d02fef7924fb942b37a6c17dd02a79f7f
+
+This reverts commit ecebca79f6976ddaddfd054d699272515869ea28.
+
+Do not enable fence callback on poll() when using fence_array causes the
+fence_array to not signal.
+
+For now we will revert the change and enable signaling everytime time
+poll is called with timeout=0 as well.
+
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Acked-by: Stefan Dirsch <sndirsch@suse.de>
+Link: http://patchwork.freedesktop.org/patch/msgid/1479457603-30758-1-git-send-email-gustavo@padovan.org
+---
+ drivers/dma-buf/sync_file.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/dma-buf/sync_file.c
++++ b/drivers/dma-buf/sync_file.c
+@@ -311,8 +311,7 @@ static unsigned int sync_file_poll(struc
+
+ poll_wait(file, &sync_file->wq, wait);
+
+- if (!poll_does_not_wait(wait) &&
+- !test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {
++ if (!test_and_set_bit(POLL_ENABLED, &sync_file->fence->flags)) {
+ if (fence_add_callback(sync_file->fence, &sync_file->cb,
+ fence_check_cb_func) < 0)
+ wake_up_all(&sync_file->wq);
diff --git a/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch b/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
new file mode 100644
index 0000000000..f216113de0
--- /dev/null
+++ b/patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
@@ -0,0 +1,36 @@
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 28 Sep 2018 09:28:27 +0200
+Patch-mainline: 4.19-rc6
+Git-commit: 6c7678674014b4552caf0e5aa0ca34078a377482
+References: bnc#1065600
+Subject: xen/blkfront: correct purging of persistent grants
+
+Commit a46b53672b2c2e3770b38a4abf90d16364d2584b ("xen/blkfront: cleanup
+stale persistent grants") introduced a regression as purged persistent
+grants were not pu into the list of free grants again. Correct that.
+
+Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+---
+ drivers/block/xen-blkfront.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
+index a71d817e900d..429d20131c7e 100644
+--- a/drivers/block/xen-blkfront.c
++++ b/drivers/block/xen-blkfront.c
+@@ -2351,8 +2351,8 @@ static void purge_persistent_grants(struct blkfront_info *info)
+ list_del(&gnt_list_entry->node);
+ gnttab_end_foreign_access(gnt_list_entry->gref, 0, 0UL);
+ info->persistent_gnts_c--;
+- __free_page(gnt_list_entry->page);
+- kfree(gnt_list_entry);
++ gnt_list_entry->gref = GRANT_INVALID_REF;
++ list_add_tail(&gnt_list_entry->node, &info->grants);
+ }
+ spin_unlock_irq(&info->io_lock);
+ }
+--
+cgit 1.2-0.3.lf.el7
+
diff --git a/patches.suse/dm-mpath-finally-fixup-cmd_flags.patch b/patches.suse/dm-mpath-finally-fixup-cmd_flags.patch
new file mode 100644
index 0000000000..e1f82eae55
--- /dev/null
+++ b/patches.suse/dm-mpath-finally-fixup-cmd_flags.patch
@@ -0,0 +1,51 @@
+From: Hannes Reinecke <hare@suse.de>
+Date: Wed, 10 Oct 2018 08:05:53 +0200
+Subject: [PATCH] dm-mpath: finally fixup cmd_flags
+Patch-Mainline: never, SLE12 SP3 specific
+References: bsc#1110930
+
+If we don't have an 'rq' argument for __multipath_map() it means we
+are called via the 'map_rq' function, which has the cloned request
+already initialized. But as we don't have access to the original
+request we really don't have a good way of initializing the flags
+of the cloned request, other than setting the failfast bits.
+The remaining initialisation has to be done in setup_clone().
+
+Signed-off-by: Hannes Reinecke <hare@suse.com>
+---
+ drivers/md/dm-mpath.c | 6 +-----
+ drivers/md/dm-rq.c | 1 +
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
+index 6d116deb2ba4..a01067e01739 100644
+--- a/drivers/md/dm-mpath.c
++++ b/drivers/md/dm-mpath.c
+@@ -561,11 +561,7 @@ static int __multipath_map(struct dm_target *ti, struct request *clone,
+ */
+ clone->q = bdev_get_queue(bdev);
+ clone->rq_disk = bdev->bd_disk;
+- if (rq)
+- clone->cmd_flags = rq->cmd_flags;
+- else
+- clone->cmd_flags = 0;
+- clone->cmd_flags |= REQ_NOMERGE | REQ_FAILFAST_TRANSPORT;
++ clone->cmd_flags |= REQ_FAILFAST_TRANSPORT;
+ } else {
+ /*
+ * blk-mq request-based interface; used by both:
+diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
+index a0701a7fd016..d1a93c0e4b9f 100644
+--- a/drivers/md/dm-rq.c
++++ b/drivers/md/dm-rq.c
+@@ -498,6 +498,7 @@ static int setup_clone(struct request *clone, struct request *rq,
+ if (r)
+ return r;
+
++ clone->cmd_flags = rq->cmd_flags | REQ_NOMERGE;
+ clone->end_io = end_clone_request;
+ clone->end_io_data = tio;
+
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 62e1d113d0..43ee3aa1ad 100644
--- a/series.conf
+++ b/series.conf
@@ -12024,6 +12024,9 @@
# bsc#1106929
patches.fixes/0001-drm-atmel-hlcdc-check-stride-values-in-the-first-pla.patch
+ # bsc#1111363
+ patches.fixes/0001-Revert-dma-buf-sync-file-Avoid-enable-fence-signalin.patch
+
########################################################
# video4linux
########################################################
@@ -18893,6 +18896,7 @@
patches.fixes/string-drop-__must_check-from-strscpy-and-restore-st.patch
patches.kabi/strscpy-annotation-drop-kABI-workaround.patch
+ patches.drivers/watchdog-w83627hf_wdt-support-NCT6102.patch
patches.drivers/watchdog-w83627hf_wdt-support-Inves.patch
########################################################
@@ -20552,6 +20556,7 @@
patches.drivers/dm-mpath-do-not-lock-up-a-CPU-with-requeuing-activit.patch
patches.suse/dm-Always-copy-cmd_flags-when-cloning-a-request.patch
patches.fixes/dm-mpath-do-not-try-to-access-NULL-rq.patch
+ patches.suse/dm-mpath-finally-fixup-cmd_flags.patch
# bsc#1078609
patches.fixes/0001-md-raid1-Use-a-new-variable-to-count-flighting-sync-.patch
patches.fixes/0002-md-document-lifetime-of-internal-rdev-pointer.patch
@@ -25165,6 +25170,9 @@
patches.drivers/0019-i2c-xlp9xx-Make-sure-the-transfer-size-is-not-more-t.patch
patches.drivers/0020-i2c-xlp9xx-Fix-case-where-SSIF-read-transaction-comp.patch
+ patches.drivers/0001-mmc-mmci-stop-building-qcom-dml-as-module.patch
+ patches.drivers/0002-phy-qcom-ufs-add-MODULE_LICENSE-tag.patch
+
########################################################
# kGraft
########################################################
@@ -25421,6 +25429,8 @@
patches.fixes/0003-xen-blkfront-cleanup-stale-persistent-grants.patch
patches.fixes/0004-xen-blkfront-reorder-tests-in-xlblk_init.patch
+ patches.fixes/xen-blkfront-correct-purging-of-persistent-grants.patch
+
#bsc1105795
patches.fixes/0001-xen-issue-warning-message-when-out-of-grant-maptrack.patch
diff --git a/supported.conf b/supported.conf
index f1047e0014..2c3ae3edde 100644
--- a/supported.conf
+++ b/supported.conf
@@ -1150,6 +1150,7 @@
drivers/mmc/card/mmc_block
drivers/mmc/card/sdio_uart
drivers/mmc/core/mmc_core
+- drivers/mmc/host/armmmci
drivers/mmc/host/bcm2835-sdhost # RPi3 (bsc#983145)
- drivers/mmc/host/cb710-mmc
drivers/mmc/host/dw_mmc
@@ -1159,7 +1160,6 @@
drivers/mmc/host/dw_mmc-pltfm
drivers/mmc/host/dw_mmc-rockchip
drivers/mmc/host/mmci
- drivers/mmc/host/mmci_qcom_dml
- drivers/mmc/host/mtk-sd
drivers/mmc/host/rtsx_pci_sdmmc
drivers/mmc/host/rtsx_usb_sdmmc