]> git.proxmox.com Git - pve-kernel.git/commitdiff
rebase patches on top of Ubuntu-5.3.0-25.27
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 5 Dec 2019 06:16:43 +0000 (07:16 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 5 Dec 2019 06:16:43 +0000 (07:16 +0100)
(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
patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch

index 7dc09bd48342e67882d31a0117a29a3dbfbe7376..a6c9e596cb436deac949d71d9f0856aeeea4b31a 100644 (file)
@@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index bf529cbe68b9..13b285c23179 100644
+index 76e82a38ba09..0c9417dab9d9 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3386,6 +3386,15 @@
+@@ -3389,6 +3389,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).
index 3c9aaa2776898a547e803fdeacd15a2b06bd34f8..86a0d5bd88c00ec866e680f3b060e4ec87966bf5 100644 (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 9d4e03eddccf..403eccb98d73 100644
+index 49ef54267061..91e56a9b0661 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);