Merge branch 'master' of git://git.proxmox.com/git/pve-kernel

This change tracks the upstream repository for the recent changes to ZFS.
2020-11-12 16:08:01 +01:00 · 2020-11-12 16:08:01 +01:00 · 1dc101c237
commit 1dc101c237
parent b23e4ac824 74eaf7a3f8
6 changed files with 6789 additions and 6757 deletions
--- a/patches/pve/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
+++ b/patches/pve/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 35a82cb10556..84cf5dcb0405 100644
+index e21dd82babf7..d77e312ba5cc 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);