rebase patches on top of Ubuntu-5.0.0-33.35
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
7622a48de8
commit
46396362f1
@ -75,7 +75,7 @@ index 3dda6833f586..241de26a2f17 100644
|
|||||||
Safety option to keep boot IRQs enabled. This
|
Safety option to keep boot IRQs enabled. This
|
||||||
should never be necessary.
|
should never be necessary.
|
||||||
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
|
||||||
index 66eac47bbdd6..315e170523d8 100644
|
index e2479ccedc91..4981d0ec7960 100644
|
||||||
--- a/drivers/pci/quirks.c
|
--- a/drivers/pci/quirks.c
|
||||||
+++ b/drivers/pci/quirks.c
|
+++ b/drivers/pci/quirks.c
|
||||||
@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
|
@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
|
||||||
index fb467d310c99..3759f52b5966 100644
|
index 87e476f7ef15..d27b75c41982 100644
|
||||||
--- a/arch/x86/kvm/vmx/vmx.c
|
--- a/arch/x86/kvm/vmx/vmx.c
|
||||||
+++ b/arch/x86/kvm/vmx/vmx.c
|
+++ b/arch/x86/kvm/vmx/vmx.c
|
||||||
@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
@@ -106,7 +106,7 @@ module_param(enable_apicv, bool, S_IRUGO);
|
||||||
|
Loading…
Reference in New Issue
Block a user