[pve-devel] [PATCH kernel 4.15 2/3] rebase patches

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 .../0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch   | 2 +-
 .../0007-Revert-UBUNTU-Packaging-retpoline-add-safe-usage-hin.patch   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
index 63bd832..36a59ea 100644
--- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
+++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
@@ -54,7 +54,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at 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 @@
diff --git a/patches/kernel/0007-Revert-UBUNTU-Packaging-retpoline-add-safe-usage-hin.patch b/patches/kernel/0007-Revert-UBUNTU-Packaging-retpoline-add-safe-usage-hin.patch
index bd7b138..0fdf812 100644
--- a/patches/kernel/0007-Revert-UBUNTU-Packaging-retpoline-add-safe-usage-hin.patch
+++ b/patches/kernel/0007-Revert-UBUNTU-Packaging-retpoline-add-safe-usage-hin.patch
@@ -19,7 +19,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler at 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
-- 
2.14.2