From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 862C6311582; Mon, 13 Oct 2025 15:08:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368113; cv=none; b=sUhD6FrOiziicfDTuvr9pGSPXwUOgAkJz8SlsGiP/xIDivrKWhd1VxSH8XbBZ8mny+H4pVRAyxJQGCsrt4Z3amMF0Q0edFORDlOdzC8PKY6ijOX5TwIqUmO0k5aMyTn4X/IbStskgN37pxRs6bYvU44FhbJ4nP9hVrrG+F0+Uv4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760368113; c=relaxed/simple; bh=fUTURClY7P35QmmCnnZlk4dKTV984s1uZOcbLfVLYwM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JWhlJCbuOhJIUB4YRvWwS1V6edcBsPS2EPJZsoTJJr3OTApQN7PyEXsKQGaTedJQCFw18Ny5j5jBP4Qa3mH7YYDAHtFK874Vku4+xjFJenPo0FurUHxN6Z2nu5IMn7Tt5Bphzqu3py25J0bfg2Er/I+cWyqYL364Wx74FLli4Ns= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=f32VMJKh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="f32VMJKh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F229DC4CEE7; Mon, 13 Oct 2025 15:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760368113; bh=fUTURClY7P35QmmCnnZlk4dKTV984s1uZOcbLfVLYwM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f32VMJKhhGdM8t9HZKQdEmhisVA6uTzLImy6YxELdrt/n0W3b86Z59r3OkWI0wjXN 9kQPjyooW+qG1semX4caK/L3Qa+++kMtUfj/DJmAdYq/oyvRhUJZxbZxJCPX+B8OWD 3Rdp6XjM0FvgXdrYY8bwHgWirfU9d9hqDfME93jE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Genjian Zhang , Damien Le Moal , Jens Axboe , Sasha Levin Subject: [PATCH 6.12 049/262] null_blk: Fix the description of the cache_size module argument Date: Mon, 13 Oct 2025 16:43:11 +0200 Message-ID: <20251013144327.896256565@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013144326.116493600@linuxfoundation.org> References: <20251013144326.116493600@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Genjian Zhang [ Upstream commit 7942b226e6b84df13b46b76c01d3b6e07a1b349e ] When executing modinfo null_blk, there is an error in the description of module parameter mbps, and the output information of cache_size is incomplete.The output of modinfo before and after applying this patch is as follows: Before: [...] parm: cache_size:ulong [...] parm: mbps:Cache size in MiB for memory-backed device. Default: 0 (none) (uint) [...] After: [...] parm: cache_size:Cache size in MiB for memory-backed device. Default: 0 (none) (ulong) [...] parm: mbps:Limit maximum bandwidth (in MiB/s). Default: 0 (no limit) (uint) [...] Fixes: 058efe000b31 ("null_blk: add module parameters for 4 options") Signed-off-by: Genjian Zhang Reviewed-by: Damien Le Moal Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/null_blk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index f10369ad90f76..ceb7aeca5d9bd 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -223,7 +223,7 @@ MODULE_PARM_DESC(discard, "Support discard operations (requires memory-backed nu static unsigned long g_cache_size; module_param_named(cache_size, g_cache_size, ulong, 0444); -MODULE_PARM_DESC(mbps, "Cache size in MiB for memory-backed device. Default: 0 (none)"); +MODULE_PARM_DESC(cache_size, "Cache size in MiB for memory-backed device. Default: 0 (none)"); static bool g_fua = true; module_param_named(fua, g_fua, bool, 0444); -- 2.51.0