From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 12 May 2017 09:38:36 +0000 (+0200)
Subject: fix up quilt-mail due to kup changes.
X-Git-Tag: v4.4.68~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba4c55c4e4e00dcb97d494009614b14fc58f1da7;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up quilt-mail due to kup changes.
---

diff --git a/queue-3.18/arm-8452-3-pj4-make-coprocessor-access-sequences-buildable-in-thumb2-mode.patch b/queue-3.18/arm-8452-3-pj4-make-coprocessor-access-sequences-buildable-in-thumb2-mode.patch
deleted file mode 100644
index bbabf9f584e..00000000000
--- a/queue-3.18/arm-8452-3-pj4-make-coprocessor-access-sequences-buildable-in-thumb2-mode.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5008efc83bf85b647aa1cbc44718b1675bbb7444 Mon Sep 17 00:00:00 2001
-From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Date: Tue, 22 Dec 2015 08:24:59 +0100
-Subject: ARM: 8452/3: PJ4: make coprocessor access sequences buildable in Thumb2 mode
-
-From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-
-commit 5008efc83bf85b647aa1cbc44718b1675bbb7444 upstream.
-
-The PJ4 inline asm sequence to write to cp15 cannot be built in Thumb-2
-mode, due to the way it performs arithmetic on the program counter, so it
-is built in ARM mode instead. However, building C files in ARM mode under
-CONFIG_THUMB2_KERNEL is problematic, since the instrumentation performed
-by subsystems like ftrace does not expect having to deal with interworking
-branches.
-
-Since the sequence in question is simply a poor man's ISB instruction,
-let's use a straight 'isb' instead when building in Thumb2 mode. Thumb2
-implies V7, so 'isb' should always be supported in that case.
-
-Acked-by: Arnd Bergmann <arnd@arndb.de>
-Acked-by: Nicolas Pitre <nico@linaro.org>
-Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
-Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/kernel/Makefile  |    1 -
- arch/arm/kernel/pj4-cp0.c |    4 ++++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
---- a/arch/arm/kernel/Makefile
-+++ b/arch/arm/kernel/Makefile
-@@ -84,7 +84,6 @@ obj-$(CONFIG_CPU_PJ4B)		+= pj4-cp0.o
- obj-$(CONFIG_IWMMXT)		+= iwmmxt.o
- obj-$(CONFIG_PERF_EVENTS)	+= perf_regs.o
- obj-$(CONFIG_HW_PERF_EVENTS)	+= perf_event.o perf_event_cpu.o
--CFLAGS_pj4-cp0.o		:= -marm
- AFLAGS_iwmmxt.o			:= -Wa,-mcpu=iwmmxt
- obj-$(CONFIG_ARM_CPU_TOPOLOGY)  += topology.o
- 
---- a/arch/arm/kernel/pj4-cp0.c
-+++ b/arch/arm/kernel/pj4-cp0.c
-@@ -66,9 +66,13 @@ static void __init pj4_cp_access_write(u
- 
- 	__asm__ __volatile__ (
- 		"mcr	p15, 0, %1, c1, c0, 2\n\t"
-+#ifdef CONFIG_THUMB2_KERNEL
-+		"isb\n\t"
-+#else
- 		"mrc	p15, 0, %0, c1, c0, 2\n\t"
- 		"mov	%0, %0\n\t"
- 		"sub	pc, pc, #4\n\t"
-+#endif
- 		: "=r" (temp) : "r" (value));
- }
- 
diff --git a/scripts/quilt-mail b/scripts/quilt-mail
index db766650297..aecd204dd28 100755
--- a/scripts/quilt-mail
+++ b/scripts/quilt-mail
@@ -149,7 +149,8 @@ sed -i -e "s/Cc: stable@vger\.kernel\.org/Cc: torvalds@linux-foundation\.org, ak
 
 # Create a script to upload the patch to kernel.org and to send the patches out
 echo "#!/bin/bash" > ${TMP_DIR}/send_it_off
-echo "kup --host=gregkh@geb.kernel.org put patch-${FULL_VERSION} patch-${FULL_VERSION}.asc /pub/linux/kernel/v${VER}/stable-review/patch-${FULL_VERSION}.gz" >> ${TMP_DIR}/send_it_off
+#echo "kup --host=gregkh@geb.kernel.org put patch-${FULL_VERSION} patch-${FULL_VERSION}.asc /pub/linux/kernel/v${VER}/stable-review/patch-${FULL_VERSION}.gz" >> ${TMP_DIR}/send_it_off
+echo "kup --host=git@gitolite.kernel.org --subcmd=kup-server put patch-${FULL_VERSION} patch-${FULL_VERSION}.asc /pub/linux/kernel/v${VER}/stable-review/patch-${FULL_VERSION}.gz" >> ${TMP_DIR}/send_it_off
 echo "git send-email msg.*" >> ${TMP_DIR}/send_it_off
 chmod 755 ${TMP_DIR}/send_it_off