rebase patches on top of Ubuntu-4.15.0-50.54

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

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 7f9b3687210478715940a4fc0337f210e9a0c03b..e0918787963af67ba3b813fc35268e964e6c9bb5 100644 (file)
--- 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,10 +54,10 @@ 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 db924bca64f4..cd4dc6a4e6f2 100644
+index 2970a6bcf858..935a805afe60 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3067,6 +3067,15 @@
+@@ -3125,6 +3125,15 @@
                                Also, it enforces the PCI Local Bus spec
                                rule that those bits should be 0 in system reset
                                events (useful for kexec/kdump cases).

diff --git a/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch b/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
index 70937400eb9fcd2270d52c2d11be4844c93e5761..98180c1c1289e147035bbb214e61b2a83f2dd9cb 100644 (file)
--- a/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
+++ b/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
@@ -22,10 +22,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 3 insertions(+)
 
 diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
-index c8f73efb4ece..9e39cc8bd989 100644
+index 7ca92f9b5eae..4eb78a908544 100644
 --- a/arch/x86/include/asm/msr-index.h
 +++ b/arch/x86/include/asm/msr-index.h
-@@ -390,6 +390,7 @@
+@@ -382,6 +382,7 @@
  #define MSR_F15H_NB_PERF_CTR          0xc0010241
  #define MSR_F15H_PTSC                 0xc0010280
  #define MSR_F15H_IC_CFG                       0xc0011021
@@ -34,7 +34,7 @@ index c8f73efb4ece..9e39cc8bd989 100644
  /* Fam 10h MSRs */
  #define MSR_FAM10H_MMIO_CONF_BASE     0xc0010058
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 477563e7ccbd..f049ecfac7bb 100644
+index ac17f53812af..1154795459de 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
 @@ -2240,6 +2240,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)