From f8b324a82f2b6434a7569a520cd5162d7de1a2f1 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 29 Nov 2021 11:59:57 +0100 Subject: [PATCH] rebase patches on top of Ubuntu-5.4.0-92.103 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...0004-kvm-disable-default-dynamic-halt-polling-growth.patch | 2 +- ...Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch | 2 +- ...net-core-downgrade-unregister_netdevice-refcount-lea.patch | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch index 514ac0e..821884f 100644 --- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch +++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch @@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index 3efde90474ce..d998477e5ffa 100644 +index dd08e698a090..ac5cb7baa47a 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch index 9319a8b..a8b5f35 100644 --- a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch +++ b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch @@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c -index e177848a3631..8bc03eb967ff 100644 +index f5b7aae369e1..ba290767701e 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO); diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 226fcf6..193fe36 100644 --- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 8069ef56ee0b..6988b538f873 100644 +index 1565f9e259f8..abba17336587 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -9356,7 +9356,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -9362,7 +9362,7 @@ static void netdev_wait_allrefs(struct net_device *dev) refcnt = netdev_refcnt_read(dev); if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) { -- 2.39.5