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 D7DBE30FC1B; Wed, 28 Jan 2026 15:52:10 +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=1769615530; cv=none; b=igFeBwYGpD0b16iQIf0VF59Ulf45s1ojw3CnnSEitQ3MAIRr5zhL1mEFnvT16jCnUoASr9cYh+CgCKaVbKnuPrUUUGnCKBQOsei6GuQEju5UxHr+I0mqGmpB+fPITr0Qn4tRd/0HdqjdXxM5zfG19Yy2OIwZf+oDovkSNEvRmqM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769615530; c=relaxed/simple; bh=bbfWmYYTsnx3NeT7oC2Fa7HU9lfxHSXrHQSIbH5KeLc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SDrCbYlWQGZwtGDDISnUm3fz0qyn/tqY5TP83XB8pcFyk6UKLRKywqoaKz/2+2qvbgKg5pyko4RspU+PGYAE4pdCP3G4ZMzOIIwhS+5zHw0BWMbU55rPsN8/w8rV2fe+FJQyYOZ9QRMJI3qPfBFHxf34on/x7qN8dGu55WEmEoE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CIKXcGoe; 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="CIKXcGoe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B10BC4CEF7; Wed, 28 Jan 2026 15:52:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1769615530; bh=bbfWmYYTsnx3NeT7oC2Fa7HU9lfxHSXrHQSIbH5KeLc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CIKXcGoebpgY4UoB7/sI+xrGt/ReT1BniTuxUUN6h2uhIah5/UchvmEJFoaZxvkLl X66WxR3hmwV/KI5l02r+uAiukbZFZPspLppFe47y4+n5FA5qv+mqqbLui7qus9UiuQ YSIlXNOHLBDfVUezSqnGY99RrQRdOxkA1nrTn/V4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jakub Kicinski , Kuniyuki Iwashima , Eric Dumazet , Sasha Levin Subject: [PATCH 6.18 037/227] tools: ynl: Specify --no-line-number in ynl-regen.sh. Date: Wed, 28 Jan 2026 16:21:22 +0100 Message-ID: <20260128145345.678884443@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260128145344.331957407@linuxfoundation.org> References: <20260128145344.331957407@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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: Kuniyuki Iwashima [ Upstream commit 68578370f9b3a2aba5964b273312d51c581b6aad ] If grep.lineNumber is enabled in .gitconfig, [grep] lineNumber = true ynl-regen.sh fails with the following error: $ ./tools/net/ynl/ynl-regen.sh -f ... ynl_gen_c.py: error: argument --mode: invalid choice: '4:' (choose from user, kernel, uapi) GEN 4: net/ipv4/fou_nl.c Let's specify --no-line-number explicitly. Fixes: be5bea1cc0bf ("net: add basic C code generators for Netlink") Suggested-by: Jakub Kicinski Signed-off-by: Kuniyuki Iwashima Reviewed-by: Eric Dumazet Link: https://patch.msgid.link/20260115172533.693652-3-kuniyu@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- tools/net/ynl/ynl-regen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/net/ynl/ynl-regen.sh b/tools/net/ynl/ynl-regen.sh index 81b4ecd891006..d9809276db982 100755 --- a/tools/net/ynl/ynl-regen.sh +++ b/tools/net/ynl/ynl-regen.sh @@ -21,7 +21,7 @@ files=$(git grep --files-with-matches '^/\* YNL-GEN \(kernel\|uapi\|user\)') for f in $files; do # params: 0 1 2 3 # $YAML YNL-GEN kernel $mode - params=( $(git grep -B1 -h '/\* YNL-GEN' $f | sed 's@/\*\(.*\)\*/@\1@') ) + params=( $(git grep --no-line-number -B1 -h '/\* YNL-GEN' $f | sed 's@/\*\(.*\)\*/@\1@') ) args=$(sed -n 's@/\* YNL-ARG \(.*\) \*/@\1@p' $f) if [ $f -nt ${params[0]} -a -z "$force" ]; then -- 2.51.0