rebase patches on top of Ubuntu-5.4.0-46.50

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

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2020-08-31 10:34:18 +02:00
parent 161a0ba764
commit 0054ae0629
2 changed files with 3 additions and 3 deletions

View File

@ -75,7 +75,7 @@ index 9c05c1fd8ed2..3fe28e536a56 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 eaa0036878a9..f0e4c36c4e8d 100644
index 4b7034986223..5cfe37cdf1b4 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@ -185,7 +185,7 @@ index eaa0036878a9..f0e4c36c4e8d 100644
/*
* Decoding should be disabled for a PCI device during BAR sizing to avoid
* conflict. But doing so may cause problems on host bridge and perhaps other
@@ -4811,6 +4911,8 @@ static const struct pci_dev_acs_enabled {
@@ -4826,6 +4926,8 @@ 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 },

View File

@ -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 12813344373d..1560f78ad60e 100644
index 62dae1d694a0..4abf33b6810d 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);