From nobody Tue Oct 7 00:32:46 2025 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (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 8FF692F2C62; Wed, 16 Jul 2025 10:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661024; cv=none; b=uy8mNBsCUPHK2Z0P0SA7K2xV89nzaxxZDXi2h+/bYqeBHiPlSZ55GRxpLdT6NpoRa9UfosKRMnRdKNNub3z5/8Fmtwhfp3yWmAYdeLY5PS6tVVOxFpQLCHJ2i3B2rAXTvI31P73TAkRx1S8jmup6ywQiLJBfiUbSl0opmMte/H0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661024; c=relaxed/simple; bh=UmCzJjvKX6X1xSn7wok+fHNqVWz3FjtZ0E/u+P3dPlo=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=F2oU2Eb4A31oSeL1VQxbgzvpFTcTB08fRbDmQIsUdSSiqtKl8daClNxJv3nYphAFmqt3vRQcTSWHGEhP6MTYSKu2t+LonKdRW+YB1dd/lru6nDA19w5HKoulHwmeawRIrdjBLx+KJKotyOSsCnRShwjxwM87dsEWg/DnTLfS3ek= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=B8VovUOJ; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="B8VovUOJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1752660901; bh=vfFNFk28QfT9KpRR3twKaJ6fyuRuP6P64ejSwvxbXsQ=; h=Date:From:To:Cc:Subject:From; b=B8VovUOJKsX84IYYfcYscLfoQdsJABv2iwY6FZ5y0VwK6gs8HHtpV9xNbmdgSfmoA fBCgTn//1syjkjicX9tmyFO6EEycJVzp5oDA+5AfKS9YuK9ut5f4v/VWdwOu6Z+SR8 qMWHSsShapUvTUkHoCh5/zbUBmA2vnu5ymGQphX7hGYkL2WTbYASpruuIbzsrNKZJD f8uUwoBkaDgFVRhJCESd16d4tO5ec3lc7H5eQQ2gB9t1k7up6qHrMCH+vKiVrYCeO/ FgeLk+FXhJWSdSXROWAbSA6fuHbnQ1VW24oBrSunDpsDEGfc2+PTTfmbZGemO02V6t MEjxMAEPAsZDA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4bhsPK1WPhz4wbn; Wed, 16 Jul 2025 20:15:01 +1000 (AEST) Date: Wed, 16 Jul 2025 20:16:56 +1000 From: Stephen Rothwell To: Miguel Ojeda , Simona Vetter Cc: Alice Ryhl , Danilo Krummrich , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rust tree with the drm-misc tree Message-ID: <20250716201656.4f0ea8d7@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/axF9tQlUxjmD/o3e4O5X_DP"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/axF9tQlUxjmD/o3e4O5X_DP 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/drm/gem/mod.rs between commit: 917b10d90990 ("drm: rust: rename as_ref() to from_raw() for drm construct= ors") from the drm-misc tree and commit: 8802e1684378 ("rust: types: add Opaque::cast_from") 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. --=20 Cheers, Stephen Rothwell diff --cc rust/kernel/drm/gem/mod.rs index a24c9a2fc201,6f914ae0a5aa..000000000000 --- a/rust/kernel/drm/gem/mod.rs +++ b/rust/kernel/drm/gem/mod.rs @@@ -124,12 -124,10 +124,10 @@@ impl IntoGEMObject fo self.obj.get() } =20 - unsafe fn as_ref<'a>(self_ptr: *mut bindings::drm_gem_object) -> &'a = Self { + unsafe fn from_raw<'a>(self_ptr: *mut bindings::drm_gem_object) -> &'= a Self { - let self_ptr: *mut Opaque =3D self_ptr.= cast(); -=20 // SAFETY: `obj` is guaranteed to be in an `Object` via the sa= fety contract of this // function - unsafe { &*crate::container_of!(self_ptr, Object, obj) } + unsafe { &*crate::container_of!(Opaque::cast_from(self_ptr), Obje= ct, obj) } } } =20 --Sig_/axF9tQlUxjmD/o3e4O5X_DP Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmh3fBgACgkQAVBC80lX 0Gx0jAf9G/9ea6ueWCOlqmAoJhA4+jh+eVhFw5JBFTWSWS48AP8VlKf1JhPaj7hj Zhmw6NX/w7tM6Cr/YlQ/tSinsebhRyH2bs6D30lBenFtQprqSqivc2PgK+p/HnsW ZYW+ECdBNC87Wm6+Jxz0OpNJdhkcF3SAnfZ3hHYVROsN5Ds/CS+7Ca09JkMekaF6 X1B3Utv4RfOZRXjlF2Nag2J9j5FginurZ1YeOnQ+muN0/uDEZ0CWRU3pnSsxoIj1 +Fc/mgV/CrsOm5CJtBY8nJwkA69HiXSNjcF7kE1pAcF//59mrIMGGqYoIFRUd/Pu glNVtOCnq+dGTneBgwFkYKStTMVgUA== =ncWP -----END PGP SIGNATURE----- --Sig_/axF9tQlUxjmD/o3e4O5X_DP--