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 243A02E06E4; Sat, 12 Sep 2026 16:42:54 +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=1789231375; cv=none; b=DqZXSZ8GmefMaC8Zpd/faa1bWN2l8pSf3/8TbWy4F3ldk/WN+uUM7Qb8XeGLkLOfRFTDMtuC087NMQjdSm5NLiwfP0nwQ0XetLmBaSz6nSu6nqZzpSzEWfcLUBqF56NOpU779nswbg8FDE+DDBJ2PtHGig6mazvfMcTX0/UIRwo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789231375; c=relaxed/simple; bh=BcYQEKEpw2ln4gblKQKOHAOWoEZpnCya3T8cUL5hIdo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P0CLGVzk68z4WHmluoc202TQpGDf4FuJqTARMvnGC8XKqXFllT9o1oZJmlJUwGxy18eI/opClJ/mSuCsFLWe1Dy5csGxPWkMNyfg+emekOc3RW80LtruwmYOwj7IBJMAZTo+esRBVyWzgrAiOwUesw0wwzMhY9Vs3VVhHzdK0Po= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KuW9FwJV; 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="KuW9FwJV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB7CB1F000FF; Sat, 12 Sep 2026 16:42:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789231374; bh=BCk/HSsAC7eNGT3IFIW3WMhS4sF8YyXogqzxHvUKuqU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KuW9FwJVExG3rs7buX6Fwg8LO593Ss8Js7toAzqEQy5U0S7Gqe4Jf8LIdUFZHXcF+ ztKtbAOZdDMqXPaFjMenMPz8jsUafnMDrTEQYPKTe9tYrZ8s9rYMdIQqdQlICwpSgp rbcL3dXGzTAwmbvgwTVRctlgXi07DQdppChC2aWo= 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 6.1 0986/1191] UBI: fix two issues in the ubi.mtd MODULE_PARM_DESC Date: Sat, 12 Sep 2026 09:01:54 +0200 Message-ID: <20260912065610.352195583@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@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.1-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 184a68dca2439..d0b5f15441432 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1505,7 +1505,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" @@ -1518,9 +1518,9 @@ MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=