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 05AD039FCDE for ; Mon, 20 Apr 2026 12:57:07 +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=1776689828; cv=none; b=s3H8BiXNYAH1sQ/76G7yf3e1g/j1vI5eLlB8pLhRqB5410As6Acv920/swGI6lUgLcMNoptDCZB4psPYj55P+tOD5y5Cf2etJ0yU76eWqk/rFaOUzWsDCBoH3qSbksaPzGvUyF6j+T8wxRgvXpc2J8/SNB5ozriJNQyTEZHVCb0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776689828; c=relaxed/simple; bh=sWlXJkcDn7bI9T9UCw+243a8CIyse4TEtaASLxhAg7M=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=sbTeCjrZY/yxAdFbxfqUETTYwRf/YlyqNhasqdzHOyZP8vxuAefeNk+FIkr4Z4UXiqQt2B3NzaQeZ0MptmTduBUvigMouizTfSdKlnSt1wsjiTL6SmDR9Dmz2KE8S6szX1CtenPsOJHozWNmy+07x3k6+0dgYJEODvSjF+UtU7A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MDPh2wgp; 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="MDPh2wgp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0DCF5C19425; Mon, 20 Apr 2026 12:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776689826; bh=sWlXJkcDn7bI9T9UCw+243a8CIyse4TEtaASLxhAg7M=; h=Subject:To:Cc:From:Date:From; b=MDPh2wgp15ljBfyJwCj/xMntSFhDX6fcZ17lkkWYCryQDT4yktEImWxaqsRJtLwWJ otIf9e5t2hzRHLU32iiSYBFT97YGsuY1ownmrUOLsjehhNqhRLsfsFGfmboIVbIHOb CeYNDVhKzjTdPpwB4fvs/PS7TWzDD745QYLzvWR4= Subject: FAILED: patch "[PATCH] scripts: generate_rust_analyzer.py: define scripts" failed to apply to 6.6-stable tree To: tamird@kernel.org,daniel.almeida@collabora.com,me@kloenk.dev,tmgross@umich.edu Cc: From: Date: Mon, 20 Apr 2026 14:56:47 +0200 Message-ID: <2026042047-drizzly-oblivious-029f@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 36c619f6bd793493294becb10a02fea370b67a91 # git commit -s git send-email --to '' --in-reply-to '2026042047-drizzly-oblivious-029f@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 36c619f6bd793493294becb10a02fea370b67a91 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 22 Jan 2026 11:53:28 -0500 Subject: [PATCH] scripts: generate_rust_analyzer.py: define scripts Add IDE support for host-side scripts written in Rust. This support has been missing since these scripts were initially added in commit 9a8ff24ce584 ("scripts: add `generate_rust_target.rs`"), thus add it. Change the existing instance of extension stripping to `pathlib.Path.stem` to maintain code consistency. Fixes: 9a8ff24ce584 ("scripts: add `generate_rust_target.rs`") Cc: stable@vger.kernel.org Reviewed-by: Daniel Almeida Reviewed-by: Fiona Behrens Reviewed-by: Trevor Gross Link: https://patch.msgid.link/20260122-rust-analyzer-scripts-v1-1-ff6ba278170e@kernel.org Signed-off-by: Tamir Duberstein diff --git a/scripts/generate_rust_analyzer.py b/scripts/generate_rust_analyzer.py index 7becc2698c14..38e834bd209e 100755 --- a/scripts/generate_rust_analyzer.py +++ b/scripts/generate_rust_analyzer.py @@ -299,6 +299,18 @@ def generate_crates( "kernel", [core, macros, build_error, pin_init, ffi, bindings, uapi] ) + scripts = srctree / "scripts" + makefile = (scripts / "Makefile").read_text() + for path in scripts.glob("*.rs"): + name = path.stem + if f"{name}-rust" not in makefile: + continue + append_crate( + name, + path, + [std], + ) + def is_root_crate(build_file: pathlib.Path, target: str) -> bool: try: return f"{target}.o" in open(build_file).read() @@ -316,7 +328,7 @@ def generate_crates( for folder in extra_dirs: for path in folder.rglob("*.rs"): logging.info("Checking %s", path) - name = path.name.replace(".rs", "") + name = path.stem # Skip those that are not crate roots. if not is_root_crate(path.parent / "Makefile", name) and \