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 1468D3C9440; Wed, 8 Apr 2026 14:10:26 +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=1775657427; cv=none; b=Pzwa6ct5clDRnr9BmgSVfXnPacUMyrUs/UE7M6UWI+9Ll3xEQ3V8JVcmjRB/CtKvJ/7XhgPAQJLlEb9TkRj9VJ1pD7gXgfxgzlrJvGApsDyIV/5BfOVEHwqdCgir8LqH5eEGebvt/degiHKN2ElBiCsN+ZahhNMEL+OiTt35YUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775657427; c=relaxed/simple; bh=7mobTWvqP8lwlg0dJRWwGCMEAcHlqyzmooECA6LLTII=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Gy/3568KZukaNuDMdUCHV5TR8gDc58tpw5msEBAerOdr/vAX9QyHnL59C435NyofAALjtGz4P+mmzgHgBRLdv0ky0CzR112I3EkqkRJjmBT19DtRDob8tP9Q1u17cEltn4DS/PB0ZE+FGYp1lbpAXIs0I5RXtSy1Op+IQ/xcHco= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VJkj7JIX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VJkj7JIX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F499C19424; Wed, 8 Apr 2026 14:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775657426; bh=7mobTWvqP8lwlg0dJRWwGCMEAcHlqyzmooECA6LLTII=; h=Date:From:To:Cc:Subject:From; b=VJkj7JIXy7o2L6LPWNxptzHRc07FQHJ14eTeYI9cAtKEDX+xajUAzmKjRTPFSTyIP v+N8qRzNfoXSCzTYHL5GJKf7ongKVDO6y4lY3n9ubKm3s0bhtR450m+c+pvDCVQzxN sG7cMv3fFTezB3br7yyjWKZxeUnuQauDkqpJoc3JAPfix5jSskyYxmBf2z+rRYq+JY WtScNE8n2761FNdnhSxkst94sW0tTMtS08X6ZwZ1PiOPtzTM8/dzENcYgCNT6haMf9 PWCKL0919xtfLXZ5y3ZOMSwZ6HOZyyKqNz8FCvZ4c6/VR2vyQj2GR1ZO4F/XJUXZHy 4NYvWowikYrVg== Date: Wed, 8 Apr 2026 15:10:22 +0100 From: Mark Brown To: Dave Airlie , DRI Cc: Alexandre Courbot , Asahi Lina , Danilo Krummrich , Linux Kernel Mailing List , Linux Next Mailing List , Miguel Ojeda Subject: linux-next: manual merge of the drm tree with the rust tree Message-ID: Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi all, Today's linux-next merge of the drm tree got conflicts in: rust/kernel/lib.rs scripts/Makefile.build between commit: d1aa40daa777c ("rust: kbuild: remove `feature(...)`s that are now stable") from the rust tree and commits: 80df573af9ef3 ("rust: drm: gem: shmem: Add DRM shmem helper abstraction") 3cc319d5f433a ("rust: enable the `generic_arg_infer` feature") from the drm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/gpu/drm/tyr/driver.rs index e833e9f537b02,6114346415805..0000000000000 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs diff --cc rust/kernel/lib.rs index 0fa9d820fe7c8,40de00ce4f971..0000000000000 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@@ -16,9 -16,38 +16,12 @@@ // Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on // the unstable features in use. // -// Stable since Rust 1.79.0. -#![feature(generic_nonzero)] -#![feature(inline_const)] -#![feature(pointer_is_aligned)] -#![feature(slice_ptr_len)] -// -// Stable since Rust 1.80.0. -#![feature(slice_flatten)] -// -// Stable since Rust 1.81.0. -#![feature(lint_reasons)] -// -// Stable since Rust 1.82.0. -#![feature(offset_of_nested)] -#![feature(raw_ref_op)] -// -// Stable since Rust 1.83.0. -#![feature(const_maybe_uninit_as_mut_ptr)] -#![feature(const_mut_refs)] -#![feature(const_option)] -#![feature(const_ptr_write)] -#![feature(const_refs_to_cell)] -#![feature(const_refs_to_static)] -// -// Stable since Rust 1.84.0. -#![feature(strict_provenance)] -// + // Stable since Rust 1.89.0. + #![feature(generic_arg_infer)] + // // Expected to become stable. #![feature(arbitrary_self_types)] +#![feature(derive_coerce_pointee)] // // To be determined. #![feature(used_with_arg)] diff --cc scripts/Makefile.build index 57cff77c28973,010d08472fb2b..0000000000000 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@@ -310,13 -310,19 +310,14 @@@ $(obj)/%.lst: $(obj)/%.c FORC # The features in this list are the ones allowed for non-`rust/` code. # -# - Stable since Rust 1.79.0: `feature(slice_ptr_len)`. -# - Stable since Rust 1.81.0: `feature(lint_reasons)`. -# - Stable since Rust 1.82.0: `feature(asm_const)`, -# `feature(offset_of_nested)`, `feature(raw_ref_op)`. -# - Stable since Rust 1.84.0: `feature(strict_provenance)`. # - Stable since Rust 1.87.0: `feature(asm_goto)`. + # - Stable since Rust 1.89.0: `feature(generic_arg_infer)`. # - Expected to become stable: `feature(arbitrary_self_types)`. # - To be determined: `feature(used_with_arg)`. # # Please see https://github.com/Rust-for-Linux/linux/issues/2 for details on # the unstable features in use. - rust_allowed_features := arbitrary_self_types,asm_goto,used_with_arg -rust_allowed_features := asm_const,asm_goto,arbitrary_self_types,generic_arg_infer,lint_reasons,offset_of_nested,raw_ref_op,slice_ptr_len,strict_provenance,used_with_arg ++rust_allowed_features := arbitrary_self_types,asm_goto,generic_arg_infer,used_with_arg # `--out-dir` is required to avoid temporaries being created by `rustc` in the # current working directory, which may be not accessible in the out-of-tree