aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/vhost_task.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-04-28 09:45:00 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-04-28 09:45:00 +0200
commit4f822ad5ee944ffafc21937a32dd055f1df5c28d (patch)
tree9b38a39de453ec1694fb383a812639162d1182a0 /kernel/vhost_task.c
parentrpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send() (diff)
parentLinux 6.15-rc4 (diff)
downloadlinux-4f822ad5ee944ffafc21937a32dd055f1df5c28d.tar.gz
linux-4f822ad5ee944ffafc21937a32dd055f1df5c28d.zip
Merge 6.15-rc4 into char-misc-next
We need the char-misc fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/vhost_task.c')
-rw-r--r--kernel/vhost_task.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/vhost_task.c b/kernel/vhost_task.c
index 2ef2e1b80091..2f844c279a3e 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().
*/