rebase patches

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2018-04-20 11:35:55 +02:00 committed by Thomas Lamprecht
parent eb19cd991b
commit 927081a949
2 changed files with 3 additions and 3 deletions

View File

@ -54,7 +54,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
2 files changed, 110 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 2db36b52a4ff..9b7f4e3e6e30 100644
index f49ba96f8881..133fcf975b80 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2968,6 +2968,15 @@

View File

@ -19,7 +19,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 9dc3f41f4ff5..36247e983f4b 100644
index e79e11fbd22c..36247e983f4b 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -297,27 +297,19 @@ objtool_dep = $(objtool_obj) \
@ -27,7 +27,7 @@ index 9dc3f41f4ff5..36247e983f4b 100644
include/config/stack/validation.h)
-ifdef CONFIG_RETPOLINE
-cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/debian/scripts/retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))";
-cmd_ubuntu_retpoline = $(CONFIG_SHELL) $(srctree)/scripts/ubuntu-retpoline-extract-one $(@) $(<) "$(filter -m16 %code16gcc.h,$(a_flags))";
-else
-cmd_ubuntu_retpoline =
-endif