From 3ea6393f638680051ff18b24f1d5240e6a5e43ec Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 29 Nov 2021 12:07:43 +0100 Subject: [PATCH] rebase patches on top of Ubuntu-5.13.0-23.23 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- .../0004-kvm-disable-default-dynamic-halt-polling-growth.patch | 2 +- ...Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch} | 0 ...ing-race.patch => 0009-io-wq-fix-queue-stalling-race.patch} | 3 --- ...io-wq-split-bounded-and-unbounded-work-into-separate.patch} | 3 --- 4 files changed, 1 insertion(+), 7 deletions(-) rename patches/kernel/{0009-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch => 0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch} (100%) rename patches/kernel/{0010-io-wq-fix-queue-stalling-race.patch => 0009-io-wq-fix-queue-stalling-race.patch} (99%) rename patches/kernel/{0011-io-wq-split-bounded-and-unbounded-work-into-separate.patch => 0010-io-wq-split-bounded-and-unbounded-work-into-separate.patch} (99%) 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 fd6190f..00c6bba 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 1dcc66060a19..c0ca4f494a02 100644 +index 3b316cb42554..71aba634a6a8 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -78,7 +78,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0009-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch b/patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch similarity index 100% rename from patches/kernel/0009-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch rename to patches/kernel/0008-Revert-block-remove-the-ERESTARTSYS-handling-in-blkd.patch diff --git a/patches/kernel/0010-io-wq-fix-queue-stalling-race.patch b/patches/kernel/0009-io-wq-fix-queue-stalling-race.patch similarity index 99% rename from patches/kernel/0010-io-wq-fix-queue-stalling-race.patch rename to patches/kernel/0009-io-wq-fix-queue-stalling-race.patch index 5ef160d..05fb6bc 100644 --- a/patches/kernel/0010-io-wq-fix-queue-stalling-race.patch +++ b/patches/kernel/0009-io-wq-fix-queue-stalling-race.patch @@ -67,6 +67,3 @@ index 6612d0aa497e..33678185f3bc 100644 raw_spin_unlock_irq(&wqe->lock); if (!work) --- -2.30.2 - diff --git a/patches/kernel/0011-io-wq-split-bounded-and-unbounded-work-into-separate.patch b/patches/kernel/0010-io-wq-split-bounded-and-unbounded-work-into-separate.patch similarity index 99% rename from patches/kernel/0011-io-wq-split-bounded-and-unbounded-work-into-separate.patch rename to patches/kernel/0010-io-wq-split-bounded-and-unbounded-work-into-separate.patch index 47df331..789b199 100644 --- a/patches/kernel/0011-io-wq-split-bounded-and-unbounded-work-into-separate.patch +++ b/patches/kernel/0010-io-wq-split-bounded-and-unbounded-work-into-separate.patch @@ -410,6 +410,3 @@ index 33678185f3bc..2496d8781ea1 100644 INIT_HLIST_NULLS_HEAD(&wqe->free_list, 0); INIT_LIST_HEAD(&wqe->all_list); } --- -2.30.2 -