From 1615b3ee929683cc560fcfdd9bc0b146da3a51cd Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 29 Mar 2022 10:31:51 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-5.15.0-24.24 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...ides-for-missing-ACS-capabilities-4..patch | 2 +- ...-default-dynamic-halt-polling-growth.patch | 2 +- ...ftover-reference-of-ubuntu-hio-drive.patch | 32 ------------------- 3 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 patches/kernel/0014-Ubuntu-remove-leftover-reference-of-ubuntu-hio-drive.patch 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 15ff1ea..8a51438 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 @@ -75,7 +75,7 @@ index 369d7f3f63cb..92f35bf44f49 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 8e352736734f..0d5b4fd01aae 100644 +index bf3af7d81bdc..04ef248fb1af 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) 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 bfd0f8e..ecf9691 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 f8b42e19bc77..e368e59f1ee0 100644 +index fcceb8443aa9..f26717dea65f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -79,7 +79,7 @@ module_param(halt_poll_ns, uint, 0644); diff --git a/patches/kernel/0014-Ubuntu-remove-leftover-reference-of-ubuntu-hio-drive.patch b/patches/kernel/0014-Ubuntu-remove-leftover-reference-of-ubuntu-hio-drive.patch deleted file mode 100644 index 299764f..0000000 --- a/patches/kernel/0014-Ubuntu-remove-leftover-reference-of-ubuntu-hio-drive.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Thomas Lamprecht -Date: Sat, 12 Mar 2022 16:07:49 +0100 -Subject: [PATCH] Ubuntu: remove leftover reference of ubuntu/hio driver - -A single reference to the hio driver was forgotten when it was -removed recently. While this reference is not a problem for the build -itself, it breaks the __clean target from 'scripts/Makefile.clean' -here, as make cannot enter the "ubuntu/hio" folder for cleaning due -to ENOENT. - -Fixes: 4ea6dd9afa0a0d ("UBUNTU: Remove ubuntu/hio driver") -Signed-off-by: Thomas Lamprecht ---- - ubuntu/Makefile | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/ubuntu/Makefile b/ubuntu/Makefile -index 27fa95ba242a..3bfc4494c069 100644 ---- a/ubuntu/Makefile -+++ b/ubuntu/Makefile -@@ -15,10 +15,6 @@ - ## - ## - ## --obj-$(CONFIG_HIO) += hio/ --## --## --## - obj-$(CONFIG_UBUNTU_HOST) += ubuntu-host/ - ## - ##