From nobody Thu Oct 2 13:03:46 2025 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 563E6313296; Tue, 16 Sep 2025 13:27:32 +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=1758029252; cv=none; b=TSmrMs4ESXBfqWK8ojf342Vv4SodWX8hHInqRly//I/kLAzqoZL/8o3EkRBLEOIdHJGLuWOwosdJtsQQGX5VBB/OS0RFh/uSVEzyp729p+EGnypjboLUI3Pw97scLHkFrxH3DvocPCXQnqKvyVT/gac5qxFCXheomsLSytEIz9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758029252; c=relaxed/simple; bh=ErN6HnTAqvbC8aDztnEdt32hRdQoSloMFcYtkBtalp4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition; b=Vy6dqHNZr+Q0mb6i2v9Wa5bCVOPpPqpmL/opxdBqYoy4Wf9DGHPqxsU74KZuUf9vYjd1xCYfQ76EhknwSQaoyA3tjwITL9jwJ3Kfi1/XAoW2YmY4Ad4uWi+UmWZbvEGE6of1yG4f3ioLdPTa3nUHoYwAEC/1tKdMFa9w8qMXpLw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EN2fQACk; 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="EN2fQACk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 34DA2C4CEEB; Tue, 16 Sep 2025 13:27:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1758029251; bh=ErN6HnTAqvbC8aDztnEdt32hRdQoSloMFcYtkBtalp4=; h=Date:From:To:Cc:Subject:From; b=EN2fQACkO5p1uIuZ7gjDBDF0JIVQzMm3pmQPUpcy+1kfytpPriHFFE4Z6qsLuy6Xc CIgD5PetYiLbk/YBTMfhW+7Z/+Kq5nRE3hWHx5VZwb4iNjuJrLOwKbtWIRJQ/spM8f dzeqzGn5abtMsQgwaccxUwJPVGikrqTqgo6j1we5rLxB1nAeCm21x264NU74jgP2dJ B5UBkoq4ebJCPN6CdnUHLIHb1OdyTB9c5L7QkuA7rgd2BRFtWNamDXKQvLBfjHr8CR fR1ZwayqLsbHjkn3xBb3FW7OMGVacvGySb1l/ZwkabziajiXoGgApRFIwWjBe8NHv3 h0Zqzf226193g== Date: Tue, 16 Sep 2025 14:27:27 +0100 From: Mark Brown To: Miguel Ojeda Cc: Greg KH , "Rafael J. Wysocki" , Danilo Krummrich , Linux Kernel Mailing List , Linux Next Mailing List , Shankari Anand , Tamir Duberstein Subject: linux-next: manual merge of the rust tree with the driver-core tree Message-ID: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Q7K+ibzzMAsNesrF" Content-Disposition: inline --Q7K+ibzzMAsNesrF Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the rust tree got a conflict in: rust/kernel/device.rs between commit: 1e180614b3608 ("rust: driver-core: Update ARef and AlwaysRefCounted impor= ts from sync::aref") from the driver-core tree and commit: 97bcbe585476e ("rust: device: use `kernel::{fmt,prelude::fmt!}`") from the rust 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 rust/kernel/device.rs index c2a6f5c203f04,303af0ef9bf73..0000000000000 --- a/rust/kernel/device.rs +++ b/rust/kernel/device.rs @@@ -5,11 -5,10 +5,11 @@@ //! C header: [`include/linux/device.h`](srctree/include/linux/device.h) =20 use crate::{ - bindings, + bindings, fmt, - types::{ARef, ForeignOwnable, Opaque}, + sync::aref::ARef, + types::{ForeignOwnable, Opaque}, }; - use core::{fmt, marker::PhantomData, ptr}; + use core::{marker::PhantomData, ptr}; =20 #[cfg(CONFIG_PRINTK)] use crate::c_str; --Q7K+ibzzMAsNesrF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmjJZb4ACgkQJNaLcl1U h9AIJgf/VmyfdOVI7FvbdDguDm/Rod8CJ64pZiNz7Gk9xOzNjrj/gjvdFUlJjiPS yXU3qJuq4tD2pefhUrQoFcLdCTw73C8dI0zYPdhgr8EBwUXr9Zk+D5B2KDx7cWvr BGFkflEUEB+wm7l4TVFPQVB9NzWrp1dq99TrT3MK96rWGCib7lCIOBzc3ULRmurZ 3y6epS8gkUgWHm/Za4uImyaIRPyVIFLyP7/+QjmFlkFnAxUu5vY+cvTRdXrjjxkS DrXSckHZNaEbpUzyPSXjvD0WrPeH+uj3mmbO1dtV8oNsCMHEks8ZurJsLbmVd4Jp 6JLHpn8cXPI7ywcAhbI5jfh5zD2tkw== =0L8K -----END PGP SIGNATURE----- --Q7K+ibzzMAsNesrF--