From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 53294346E75; Sat, 12 Sep 2026 20:01:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789243286; cv=none; b=jGz0Pjd4dO94m8VK5CYTutQ4FD8BbgfdwB2EO1gvo3jFLoUA0WZhilXl8Yz6nnE9iyxgR2mnIodFcvbODxx0Qfoc9wzkw1ZVGypHhUUvjsxOV1Oi+/RRO9B+Cf+I0ZF/qudzP0/IOXCwJmfz2nifNP6is6oPxNLNRPvgFs7wClY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789243286; c=relaxed/simple; bh=qleDIZkbi1I0hssmpNWQjq+eTqoD+tMwB4fzpEqYurw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VAge+7jSg1YucHjPaYg1M+bxc1dni7SlroDao3oj9zS0cJ0O7/HaiJ1Grs83YWfYkCEHBg7fvy81k5SysXRWNylLKXoUe8cqwg+rbdoQHwlY1CsoOT/BZxiyTH2wNrRqUAjxfjEyrPDbE0hqxulQNuX9KuT55t5Cct+ptDv+bts= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=B01ZmTpU; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="B01ZmTpU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABD661F000FF; Sat, 12 Sep 2026 20:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789243285; bh=1Jf5wglZULLG+8qNAHwyYldqQf6UQ1UadfhJmGfbA5I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=B01ZmTpUq7j4liRlT6PZy+jzTko/VswxMWFaHt/KW8UpMUgWbVXelProNedBC8Iy4 RZ5F7XbrA49917IXuWnq4c5ohgijUuJllvwq9Suz0DyvF5MbIpP4lIpcrFp83VhdEK uVnZqq1RcpnAH2xDpN9TzpgwiC4cYif9M8oJTH8w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ran Hongyun , Zhihao Cheng , Richard Weinberger , Sasha Levin Subject: [PATCH 5.10 695/798] UBI: fix two issues in the ubi.mtd MODULE_PARM_DESC Date: Sat, 12 Sep 2026 09:05:23 +0200 Message-ID: <20260912065533.025103462@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065516.948645775@linuxfoundation.org> References: <20260912065516.948645775@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ran Hongyun [ Upstream commit ff7937d14f5333ec7e6fb50d00a152d7974f4105 ] Fix two issues introduced before: - The parameter format string was missing the enable_fm and need_resv_pool tokens introduced in an earlier commit. - The bad-block reservation note was misplaced after Example 5 instead of after Example 3. It was misplaced due to an earlier patch. Fixes: 83ff59a06663 ("UBI: support ubi_num on mtd.ubi command line") Signed-off-by: Ran Hongyun Reviewed-by: Zhihao Cheng Signed-off-by: Richard Weinberger Signed-off-by: Sasha Levin --- drivers/mtd/ubi/build.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index c59b04d8a39e5..ed6baab4903fb 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1507,7 +1507,7 @@ static int ubi_mtd_param_parse(const char *val, const struct kernel_param *kp) } module_param_call(mtd, ubi_mtd_param_parse, NULL, NULL, 0400); -MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=[,[,max_beb_per1024[,ubi_num]]].\n" +MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=[,[,max_beb_per1024[,ubi_num[,enable_fm[,need_resv_pool]]]]].\n" "Multiple \"mtd\" parameters may be specified.\n" "MTD devices may be specified by their number, name, or path to the MTD character device node.\n" "Optional \"vid_hdr_offs\" parameter specifies UBI VID header position to be used by UBI. (default value if 0)\n" @@ -1520,9 +1520,9 @@ MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=