diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 09:59:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 10:00:58 +0200 |
| commit | 24035886d735e4ce1c4605638adafe1fa2988e7a (patch) | |
| tree | 8c75625bc848a16bde8ce69e902c70c28e7d3da7 /kernel/vhost_task.c | |
| parent | 3aba0b40cacdfba4a604dd09315fa6cdbeb0ed90 (diff) | |
| parent | 92a09c47464d040866cf2b4cd052bc60555185fb (diff) | |
Merge tag 'v6.15-rc5' into x86/cpu, to resolve conflicts
Conflicts:
tools/arch/x86/include/asm/cpufeatures.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/vhost_task.c')
| -rw-r--r-- | kernel/vhost_task.c | 2 |
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(). */ |