rebase patches on top of Ubuntu-4.15.0-92.93

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

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

patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch

@@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 110 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 18cd251f77ee..7f81cb8f8901 100644
+index d824cfb1a1a5..d0489ece2203 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3171,6 +3171,15 @@
+@@ -3177,6 +3177,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).
@@ -75,7 +75,7 @@ index 18cd251f77ee..7f81cb8f8901 100644
  				Safety option to keep boot IRQs enabled. This
  				should never be necessary.
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 93537d8a2d53..d4adea0e2e8d 100644
+index 4a03b7832fe3..93038d76bf14 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -3724,6 +3724,106 @@ static int __init pci_apply_final_quirks(void)
@@ -185,7 +185,7 @@ index 93537d8a2d53..d4adea0e2e8d 100644
  /*
   * Following are device-specific reset methods which can be used to
   * reset a single function if other methods (e.g. FLR, PM D0->D3) are
-@@ -4585,6 +4685,7 @@ static const struct pci_dev_acs_enabled {
+@@ -4619,6 +4719,7 @@ static const struct pci_dev_acs_enabled {
  	{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
  	/* APM X-Gene */
  	{ PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch

@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 50a9eb1b62f4..bfc05a718430 100644
+index 3c54b2e1b59c..5e2dbd2500fa 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644);

patches/kernel/0008-KVM-Take-vcpu-mutex-outside-vcpu_load.patch

@@ -33,10 +33,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  4 files changed, 15 insertions(+), 28 deletions(-)
 
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index b2f26d21556d..26237e905e14 100644
+index 7bc1430c6cee..748e90c9b5c6 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -10015,10 +10015,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
+@@ -10031,10 +10031,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
  static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
  {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -49,10 +49,10 @@ index b2f26d21556d..26237e905e14 100644
         free_nested(vmx);
         vcpu_put(vcpu);
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 888f2afa3bbc..d10fa4df3784 100644
+index 63edcfe5b5a4..971443af5b95 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -8043,17 +8043,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+@@ -8058,17 +8058,13 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
  
  int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
  {
@@ -72,7 +72,7 @@ index 888f2afa3bbc..d10fa4df3784 100644
  }
  
  void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
-@@ -8063,13 +8059,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -8078,13 +8074,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
  	kvm_hv_vcpu_postcreate(vcpu);
  
@@ -89,7 +89,7 @@ index 888f2afa3bbc..d10fa4df3784 100644
  
  	if (!kvmclock_periodic_sync)
  		return;
-@@ -8080,11 +8078,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -8095,11 +8093,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
  void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
  {
@@ -102,7 +102,7 @@ index 888f2afa3bbc..d10fa4df3784 100644
  	kvm_mmu_unload(vcpu);
  	vcpu_put(vcpu);
  
-@@ -8464,9 +8460,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
+@@ -8479,9 +8475,7 @@ int kvm_arch_post_init_vm(struct kvm *kvm)
  
  static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
  {
@@ -114,7 +114,7 @@ index 888f2afa3bbc..d10fa4df3784 100644
  	vcpu_put(vcpu);
  }
 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index 69d53c748ab8..c28ec6ba22fa 100644
+index 254fcf4afc4d..10f4eca3e18b 100644
 --- a/include/linux/kvm_host.h
 +++ b/include/linux/kvm_host.h
 @@ -534,7 +534,7 @@ static inline int kvm_vcpu_get_idx(struct kvm_vcpu *vcpu)
@@ -127,7 +127,7 @@ index 69d53c748ab8..c28ec6ba22fa 100644
  
  #ifdef __KVM_HAVE_IOAPIC
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index bfc05a718430..c96043446f5f 100644
+index 5e2dbd2500fa..ffac15e6dfe0 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -172,17 +172,12 @@ bool kvm_is_reserved_pfn(kvm_pfn_t pfn)

patches/kernel/0009-kvm-x86-Don-t-modify-MSR_PLATFORM_INFO-on-vCPU-reset.patch

@@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index d10fa4df3784..0660ade65196 100644
+index 971443af5b95..8083fa803a72 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -8044,6 +8044,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+@@ -8059,6 +8059,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
  int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
  {
  	vcpu->arch.arch_capabilities = kvm_get_arch_capabilities();
@@ -30,7 +30,7 @@ index d10fa4df3784..0660ade65196 100644
  	kvm_vcpu_mtrr_init(vcpu);
  	vcpu_load(vcpu);
  	kvm_vcpu_reset(vcpu, false);
-@@ -8145,7 +8146,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
+@@ -8160,7 +8161,6 @@ void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event)
  		kvm_pmu_reset(vcpu);
  		vcpu->arch.smbase = 0x30000;