rebase patches on top of Ubuntu-5.15.0-23.23

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

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 bd2e87cb46b96e9958bd3bb283fd9e20132dc01b..15ff1eab7a21cba8e321b2df84311c9a3cc2e7cd 100644 (file)
--- 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,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 21575acb6a20..fad011895cde 100644
+index 369d7f3f63cb..92f35bf44f49 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -3908,6 +3908,15 @@

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 0153a319fbc2629056512135e47cdfb02ca78ba6..bfd0f8ecae3f753c4373db48ea490c311d0a0ad0 100644 (file)
--- 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 <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 13aff136e6ee..8664870aa2c5 100644
+index f8b42e19bc77..e368e59f1ee0 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/0008-do-not-generate-split-BTF-type-info-per-default.patch b/patches/kernel/0008-do-not-generate-split-BTF-type-info-per-default.patch
index 3b3030efa0a90ebcaa6b857d76ccf306d32bf034..1a8936caf58b7248c6d98df443ac107d94671531 100644 (file)
--- a/patches/kernel/0008-do-not-generate-split-BTF-type-info-per-default.patch
+++ b/patches/kernel/0008-do-not-generate-split-BTF-type-info-per-default.patch
@@ -14,11 +14,11 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
-index 2a9b6dcdac4f..ecc18910a6b2 100644
+index 12649e4c2b29..7c2d1c272c9d 100644
 --- a/lib/Kconfig.debug
 +++ b/lib/Kconfig.debug
 @@ -325,7 +325,7 @@ config PAHOLE_HAS_SPLIT_BTF
-       def_bool $(success, test `$(PAHOLE) --version | sed -E 's/v([0-9]+)\.([0-9]+)/\1\2/'` -ge "119")
+       def_bool PAHOLE_VERSION >= 119
  
  config DEBUG_INFO_BTF_MODULES
 -      def_bool y

diff --git a/patches/kernel/0014-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/patches/kernel/0014-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
deleted file mode 100644 (file)
index 4c1755a..0000000
--- a/patches/kernel/0014-lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Mon, 21 Feb 2022 11:03:13 +0100
-Subject: [PATCH] lib/iov_iter: initialize "flags" in new pipe_buffer
-
-commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream.
-
-The functions copy_page_to_iter_pipe() and push_pipe() can both
-allocate a new pipe_buffer, but the "flags" member initializer is
-missing.
-
-Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
-To: Alexander Viro <viro@zeniv.linux.org.uk>
-To: linux-fsdevel@vger.kernel.org
-To: linux-kernel@vger.kernel.org
-Cc: stable@vger.kernel.org
-Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- lib/iov_iter.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/iov_iter.c b/lib/iov_iter.c
-index 9ffa7dc197be..fa5827e2e9a3 100644
---- a/lib/iov_iter.c
-+++ b/lib/iov_iter.c
-@@ -449,6 +449,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by
-               return 0;
- 
-       buf->ops = &page_cache_pipe_buf_ops;
-+      buf->flags = 0;
-       get_page(page);
-       buf->page = page;
-       buf->offset = offset;
-@@ -564,6 +565,7 @@ static size_t push_pipe(struct iov_iter *i, size_t size,
-                       break;
- 
-               buf->ops = &default_pipe_buf_ops;
-+              buf->flags = 0;
-               buf->page = page;
-               buf->offset = 0;
-               buf->len = min_t(ssize_t, left, PAGE_SIZE);