From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 28 May 2019 06:58:02 +0000 (+0200)
Subject: drop parisc patch from 4.4 queue
X-Git-Tag: v5.1.6~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=017a32bc1d37c869ccc6cad2d0a66ed1f6eedcd0;p=thirdparty%2Fkernel%2Fstable-queue.git

drop parisc patch from 4.4 queue
---

diff --git a/queue-4.4/parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch b/queue-4.4/parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
deleted file mode 100644
index ad8dcd83a68..00000000000
--- a/queue-4.4/parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 1829dda0e87f4462782ca81be474c7890efe31ce Mon Sep 17 00:00:00 2001
-From: Helge Deller <deller@gmx.de>
-Date: Sun, 5 May 2019 23:54:34 +0200
-Subject: parisc: Rename LEVEL to PA_ASM_LEVEL to avoid name clash with DRBD code
-
-From: Helge Deller <deller@gmx.de>
-
-commit 1829dda0e87f4462782ca81be474c7890efe31ce upstream.
-
-LEVEL is a very common word, and now after many years it suddenly
-clashed with another LEVEL define in the DRBD code.
-Rename it to PA_ASM_LEVEL instead.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Signed-off-by: Helge Deller <deller@gmx.de>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/parisc/include/asm/assembly.h |    6 +++---
- arch/parisc/kernel/head.S          |    4 ++--
- arch/parisc/kernel/syscall.S       |    2 +-
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- a/arch/parisc/include/asm/assembly.h
-+++ b/arch/parisc/include/asm/assembly.h
-@@ -59,14 +59,14 @@
- #define LDCW		ldcw,co
- #define BL		b,l
- # ifdef CONFIG_64BIT
--#  define LEVEL		2.0w
-+#  define PA_ASM_LEVEL	2.0w
- # else
--#  define LEVEL		2.0
-+#  define PA_ASM_LEVEL	2.0
- # endif
- #else
- #define LDCW		ldcw
- #define BL		bl
--#define LEVEL		1.1
-+#define PA_ASM_LEVEL	1.1
- #endif
- 
- #ifdef __ASSEMBLY__
---- a/arch/parisc/kernel/head.S
-+++ b/arch/parisc/kernel/head.S
-@@ -22,7 +22,7 @@
- #include <linux/linkage.h>
- #include <linux/init.h>
- 
--	.level	LEVEL
-+	.level	PA_ASM_LEVEL
- 
- 	__INITDATA
- ENTRY(boot_args)
-@@ -245,7 +245,7 @@ stext_pdc_ret:
- 	ldo		R%PA(fault_vector_11)(%r10),%r10
- 
- $is_pa20:
--	.level		LEVEL /* restore 1.1 || 2.0w */
-+	.level		PA_ASM_LEVEL /* restore 1.1 || 2.0w */
- #endif /*!CONFIG_64BIT*/
- 	load32		PA(fault_vector_20),%r10
- 
---- a/arch/parisc/kernel/syscall.S
-+++ b/arch/parisc/kernel/syscall.S
-@@ -48,7 +48,7 @@ registers).
- 	 */
- #define KILL_INSN	break	0,0
- 
--	.level          LEVEL
-+	.level          PA_ASM_LEVEL
- 
- 	.text
- 
diff --git a/queue-4.4/series b/queue-4.4/series
index 7c35cc81bf2..91e8e8fa0ae 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -34,7 +34,6 @@ net-mlx4_core-change-the-error-print-to-info-print.patch
 ppp-deflate-fix-possible-crash-in-deflate_init.patch
 tipc-switch-order-of-device-registration-to-fix-a-crash.patch
 tipc-fix-modprobe-tipc-failed-after-switch-order-of-device-registration.patch
-parisc-rename-level-to-pa_asm_level-to-avoid-name-clash-with-drbd-code.patch
 stm-class-fix-channel-free-in-stm-output-free-path.patch
 md-add-mddev-pers-to-avoid-potential-null-pointer-dereference.patch
 intel_th-msu-fix-single-mode-with-iommu.patch