fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/md-raid0-fix-warning-message-for-parameter-default_l.patch b/queue-4.14/md-raid0-fix-warning-message-for-parameter-default_l.patch
new file mode 100644 (file)
index 0000000..eb8b6e2
--- /dev/null
+++ b/queue-4.14/md-raid0-fix-warning-message-for-parameter-default_l.patch
@@ -0,0 +1,36 @@
+From d3d87c861efc9490c05356d8c610ca7bcd1ba797 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Mon, 14 Oct 2019 16:58:35 -0700
+Subject: md/raid0: fix warning message for parameter default_layout
+
+From: Song Liu <songliubraving@fb.com>
+
+[ Upstream commit 3874d73e06c9b9dc15de0b7382fc223986d75571 ]
+
+The message should match the parameter, i.e. raid0.default_layout.
+
+Fixes: c84a1372df92 ("md/raid0: avoid RAID0 data corruption due to layout confusion.")
+Cc: NeilBrown <neilb@suse.de>
+Reported-by: Ivan Topolsky <doktor.yak@gmail.com>
+Signed-off-by: Song Liu <songliubraving@fb.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/md/raid0.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
+index 28fb717217706..449c4dd060fcd 100644
+--- a/drivers/md/raid0.c
++++ b/drivers/md/raid0.c
+@@ -158,7 +158,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
+       } else {
+               pr_err("md/raid0:%s: cannot assemble multi-zone RAID0 with default_layout setting\n",
+                      mdname(mddev));
+-              pr_err("md/raid0: please set raid.default_layout to 1 or 2\n");
++              pr_err("md/raid0: please set raid0.default_layout to 1 or 2\n");
+               err = -ENOTSUPP;
+               goto abort;
+       }
+-- 
+2.20.1
+

diff --git a/queue-4.14/revert-drm-radeon-fix-eeh-during-kexec.patch b/queue-4.14/revert-drm-radeon-fix-eeh-during-kexec.patch
new file mode 100644 (file)
index 0000000..0c4a972
--- /dev/null
+++ b/queue-4.14/revert-drm-radeon-fix-eeh-during-kexec.patch
@@ -0,0 +1,49 @@
+From a3a7f107b087a445167664e5c39658fcbb61b1b4 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 9 Oct 2019 13:12:37 -0500
+Subject: Revert "drm/radeon: Fix EEH during kexec"
+
+From: Alex Deucher <alexander.deucher@amd.com>
+
+[ Upstream commit 8d13c187c42e110625d60094668a8f778c092879 ]
+
+This reverts commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6.
+
+This breaks some boards.  Maybe just enable this on PPC for
+now?
+
+Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205147
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/radeon/radeon_drv.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
+index 54d97dd5780a1..f4becad0a78c0 100644
+--- a/drivers/gpu/drm/radeon/radeon_drv.c
++++ b/drivers/gpu/drm/radeon/radeon_drv.c
+@@ -368,19 +368,11 @@ radeon_pci_remove(struct pci_dev *pdev)
+ static void
+ radeon_pci_shutdown(struct pci_dev *pdev)
+ {
+-      struct drm_device *ddev = pci_get_drvdata(pdev);
+-
+       /* if we are running in a VM, make sure the device
+        * torn down properly on reboot/shutdown
+        */
+       if (radeon_device_is_virtual())
+               radeon_pci_remove(pdev);
+-
+-      /* Some adapters need to be suspended before a
+-      * shutdown occurs in order to prevent an error
+-      * during kexec.
+-      */
+-      radeon_suspend_kms(ddev, true, true, false);
+ }
+ 
+ static int radeon_pmops_suspend(struct device *dev)
+-- 
+2.20.1
+

diff --git a/queue-4.14/series b/queue-4.14/series
index c214395c58883af2f196583362ca242375fe6eb7..1c1f7a67475f9ea94e2ebebf9b4f7791337116fc 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -13,3 +13,5 @@ mips-loongson-fix-the-link-time-qualifier-of-serial_.patch
 net-hisilicon-fix-usage-of-uninitialized-variable-in.patch
 r8152-set-macpassthru-in-reset_resume-callback.patch
 namespace-fix-namespace.pl-script-to-support-relativ.patch
+md-raid0-fix-warning-message-for-parameter-default_l.patch
+revert-drm-radeon-fix-eeh-during-kexec.patch