From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 25 Aug 2017 00:37:15 +0000 (-0700)
Subject: 4.12-stable patches
X-Git-Tag: v3.18.68~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9b47e73ecaced64fe7b1ba9f073f1c99206db52;p=thirdparty%2Fkernel%2Fstable-queue.git

4.12-stable patches

added patches:
	sparc64-remove-unnecessary-log-message.patch
---

diff --git a/queue-4.12/series b/queue-4.12/series
new file mode 100644
index 00000000000..ea3d43eaaeb
--- /dev/null
+++ b/queue-4.12/series
@@ -0,0 +1 @@
+sparc64-remove-unnecessary-log-message.patch
diff --git a/queue-4.12/sparc64-remove-unnecessary-log-message.patch b/queue-4.12/sparc64-remove-unnecessary-log-message.patch
new file mode 100644
index 00000000000..fb58a7f664b
--- /dev/null
+++ b/queue-4.12/sparc64-remove-unnecessary-log-message.patch
@@ -0,0 +1,31 @@
+From 6170a506899aee3dd4934c928426505e47b1b466 Mon Sep 17 00:00:00 2001
+From: Tushar Dave <tushar.n.dave@oracle.com>
+Date: Wed, 16 Aug 2017 11:09:10 -0700
+Subject: sparc64: remove unnecessary log message
+
+[ Upstream commit 6170a506899aee3dd4934c928426505e47b1b466 ]
+
+There is no need to log message if ATU hvapi couldn't get register.
+Unlike PCI hvapi, ATU hvapi registration failure is not hard error.
+Even if ATU hvapi registration fails (on system with ATU or without
+ATU) system continues with legacy IOMMU. So only log message when
+ATU hvapi successfully get registered.
+
+Signed-off-by: Tushar Dave <tushar.n.dave@oracle.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/sparc/kernel/pci_sun4v.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/arch/sparc/kernel/pci_sun4v.c
++++ b/arch/sparc/kernel/pci_sun4v.c
+@@ -1241,8 +1241,6 @@ static int pci_sun4v_probe(struct platfo
+ 			 * ATU group, but ATU hcalls won't be available.
+ 			 */
+ 			hv_atu = false;
+-			pr_err(PFX "Could not register hvapi ATU err=%d\n",
+-			       err);
+ 		} else {
+ 			pr_info(PFX "Registered hvapi ATU major[%lu] minor[%lu]\n",
+ 				vatu_major, vatu_minor);
diff --git a/queue-4.9/series b/queue-4.9/series
new file mode 100644
index 00000000000..ea3d43eaaeb
--- /dev/null
+++ b/queue-4.9/series
@@ -0,0 +1 @@
+sparc64-remove-unnecessary-log-message.patch