From be7e04a3d7a9abfd9e977c0d4fe073f9659995ca Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Wed, 23 Jun 2021 08:49:26 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.11.0-23.24 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...pci-Enable-overrides-for-missing-ACS-capabilities-4..patch | 4 ++-- ...0004-kvm-disable-default-dynamic-halt-polling-growth.patch | 2 +- ...net-core-downgrade-unregister_netdevice-refcount-lea.patch | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 88d86e8..164d21c 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index a74453c464b0..dca92e06e431 100644 +index 52b2f13eb26f..8c1bec09424b 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3646,6 +3646,15 @@ +@@ -3647,6 +3647,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). 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 dba712d..5db6088 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 2caba2828982..2080de085df5 100644 +index 7377346be880..0979e4ab19ae 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 4b07cd4..4ed84b1 100644 --- a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0005-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 a5a1dbe66b76..3847f4542b81 100644 +index 76e593a4cc30..c1e9097e7a08 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10300,7 +10300,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10346,7 +10346,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