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 2B67524CEEA; Sat, 12 Sep 2026 11:04:28 +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=1789211069; cv=none; b=r+krrm60UewlYK4c5jjmrmzxisk261SpOAqlRDl7uvF8HLvvoHVgygzwxMs+4M15PdCHE4Pl5JfB6Wag7sWuHlE8PzKs+9MzWNIHLioSenH1PrGNP3ltYc1Cmshser3KcMTuGKbESbT6xRN3SDXExI/fWScYneqOyUoOMQg1SqU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789211069; c=relaxed/simple; bh=VYk7CNkBjs04roX2siik/AXuQtfqyfAwOwdFNtbJLvI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Phx96YRUHF2sFZUpJNfBaZIbWdTkCs5YnopjlIFPa+R7mon9WcrumGOF6BJGZnz5uTXfX8KKgE687XH7keNdPm7hXv3rNtKOAnbpZd3TqjOsfGjwxlak0xN0IHQQpuw+NTskU1U+DsSlSqQs/eJtamTib+LTHMkcXUFonKSlwm4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=dYM/QE7H; 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="dYM/QE7H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 209351F000FF; Sat, 12 Sep 2026 11:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789211068; bh=4889CwU3IZDPzPcHHZRg12lGh0vL7YQJGwxm93gddyo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dYM/QE7HxSoFvlCPPRJaEpmf56M/YqjrqIEE972nnmWYokoq2m0ft8XIKaucLpXck OHhMbX5CI+CzcAlyZbNHaw9d14WrGov4+hAdJR0mGBkmv6uRNt9Jd6zL21hr5xWQYN SPrbbBUdbSvD8BMMAYWOtj+aTeLGEF8qB/XijDWg= 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.18 1148/1518] UBI: fix two issues in the ubi.mtd MODULE_PARM_DESC Date: Sat, 12 Sep 2026 08:55:17 +0200 Message-ID: <20260912065649.426955767@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@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.18-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 3b30c80cad43f..fb121b6d08484 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -1575,7 +1575,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" @@ -1588,9 +1588,9 @@ MODULE_PARM_DESC(mtd, "MTD devices to attach. Parameter format: mtd=