[linux] 04/06: Revert "Revert "module: Add retpoline tag to VERMAGIC"."

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch stretch
in repository linux.

commit 9c76312b7230413188748a6d3350a78df4aba24c
Author: Yves-Alexis Perez <corsac at corsac.net>
Date:   Sun Jan 28 17:09:21 2018 +0100

    Revert "Revert "module: Add retpoline tag to VERMAGIC"."
    
    This reverts commit 317dcf8f1f8836b7e0edeaedc5c0b373fdfc40de.
---
 debian/changelog                                   |  1 -
 ...vert-module-add-retpoline-tag-to-vermagic.patch | 51 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e9c491b..269d582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -799,7 +799,6 @@ linux (4.9.77-1) UNRELEASED; urgency=medium
   * Ignore ABI change for cpu_tlbstate (symbol not exported _GPL anymore)
   * sched/rt: Avoid ABI change in 4.9.66.
   * Ignore ABI change for tcp_cong_avoid_ai and tcp_slow_start.
-  * Revert "module: Add retpoline tag to VERMAGIC".
 
  -- Ben Hutchings <ben at decadent.org.uk>  Thu, 28 Dec 2017 02:16:23 +0000
 
diff --git a/debian/patches/debian/revert-module-add-retpoline-tag-to-vermagic.patch b/debian/patches/debian/revert-module-add-retpoline-tag-to-vermagic.patch
deleted file mode 100644
index 6310e1a..0000000
--- a/debian/patches/debian/revert-module-add-retpoline-tag-to-vermagic.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5132ede0fe8092b043dae09a7cc32b8ae7272baa Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-Date: Wed, 24 Jan 2018 15:28:17 +0100
-Subject: Revert "module: Add retpoline tag to VERMAGIC"
-
-From: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-
-commit 5132ede0fe8092b043dae09a7cc32b8ae7272baa upstream.
-
-This reverts commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12.
-
-Turns out distros do not want to make retpoline as part of their "ABI",
-so this patch should not have been merged.  Sorry Andi, this was my
-fault, I suggested it when your original patch was the "correct" way of
-doing this instead.
-
-Reported-by: Jiri Kosina <jikos at kernel.org>
-Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC")
-Acked-by: Andi Kleen <ak at linux.intel.com>
-Cc: Thomas Gleixner <tglx at linutronix.de>
-Cc: David Woodhouse <dwmw at amazon.co.uk>
-Cc: rusty at rustcorp.com.au
-Cc: arjan.van.de.ven at intel.com
-Cc: jeyu at kernel.org
-Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
-
----
- include/linux/vermagic.h |    8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
---- a/include/linux/vermagic.h
-+++ b/include/linux/vermagic.h
-@@ -24,16 +24,10 @@
- #ifndef MODULE_ARCH_VERMAGIC
- #define MODULE_ARCH_VERMAGIC ""
- #endif
--#ifdef RETPOLINE
--#define MODULE_VERMAGIC_RETPOLINE "retpoline "
--#else
--#define MODULE_VERMAGIC_RETPOLINE ""
--#endif
- 
- #define VERMAGIC_STRING 						\
- 	UTS_RELEASE " "							\
- 	MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT 			\
- 	MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS	\
--	MODULE_ARCH_VERMAGIC						\
--	MODULE_VERMAGIC_RETPOLINE
-+	MODULE_ARCH_VERMAGIC
- 
diff --git a/debian/patches/series b/debian/patches/series
index e81b51c..5c954c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -190,4 +190,3 @@ debian/revert-lib-genalloc.c-make-the-avail-variable-an-ato.patch
 debian/revert-tcp-invalidate-rate-samples-during-SACK-reneg.patch
 debian/bpf-avoid-abi-change-in-4.9.77.patch
 debian/revert-sched-rt-Simplify-the-IPI-based-RT-balancing-.patch
-debian/revert-module-add-retpoline-tag-to-vermagic.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git