From: Greg Kroah-Hartman Date: Wed, 4 Jun 2025 08:40:54 +0000 (+0200) Subject: drop 6.6 patch on request X-Git-Tag: v5.4.294~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eaf81ef7a6fb1ccfe38a43aa544ec309838ecf11;p=thirdparty%2Fkernel%2Fstable-queue.git drop 6.6 patch on request --- diff --git a/queue-6.6/series b/queue-6.6/series index dfc5ef4849..db613555fc 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -21,7 +21,6 @@ virtio_ring-fix-data-race-by-tagging-event_triggered.patch intel_th-avoid-using-deprecated-page-mapping-index-f.patch dma-mapping-avoid-potential-unused-data-compilation-.patch cgroup-fix-compilation-issue-due-to-cgroup_mutex-not.patch -vhost_task-fix-vhost_task_create-documentation.patch vhost-scsi-protect-vq-log_used-with-vq-mutex.patch scsi-mpi3mr-add-level-check-to-control-event-logging.patch net-enetc-refactor-bulk-flipping-of-rx-buffers-to-se.patch diff --git a/queue-6.6/vhost_task-fix-vhost_task_create-documentation.patch b/queue-6.6/vhost_task-fix-vhost_task_create-documentation.patch deleted file mode 100644 index 15d04d1f38..0000000000 --- a/queue-6.6/vhost_task-fix-vhost_task_create-documentation.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 83ca6dbb36636f8d826d1a33faab9884051f796c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 27 Mar 2025 13:44:35 +0100 -Subject: vhost_task: fix vhost_task_create() documentation - -From: Stefano Garzarella - -[ Upstream commit fec0abf52609c20279243699d08b660c142ce0aa ] - -Commit cb380909ae3b ("vhost: return task creation error instead of NULL") -changed the return value of vhost_task_create(), but did not update the -documentation. - -Reflect the change in the documentation: on an error, vhost_task_create() -returns an ERR_PTR() and no longer NULL. - -Signed-off-by: Stefano Garzarella -Message-Id: <20250327124435.142831-1-sgarzare@redhat.com> -Signed-off-by: Michael S. Tsirkin -Signed-off-by: Sasha Levin ---- - kernel/vhost_task.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/vhost_task.c b/kernel/vhost_task.c -index 8800f5acc0071..0e4455742190c 100644 ---- a/kernel/vhost_task.c -+++ b/kernel/vhost_task.c -@@ -111,7 +111,7 @@ EXPORT_SYMBOL_GPL(vhost_task_stop); - * @arg: data to be passed to fn and handled_kill - * @name: the thread's name - * -- * This returns a specialized task for use by the vhost layer or NULL on -+ * This returns a specialized task for use by the vhost layer or ERR_PTR() on - * failure. The returned task is inactive, and the caller must fire it up - * through vhost_task_start(). - */ --- -2.39.5 -