linux-kernel - linux-next: manual merge of the rust tree with the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250715182655.59556ba7@canb.auug.org.au>
Date: Tue, 15 Jul 2025 18:26:55 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Miguel Ojeda <ojeda@...nel.org>, Greg KH <greg@...ah.com>, Danilo
 Krummrich <dakr@...nel.org>, "Rafael J. Wysocki" <rafael@...nel.org>
Cc: Andreas Hindborg <a.hindborg@...nel.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Tamir Duberstein <tamird@...il.com>
Subject: linux-next: manual merge of the rust tree with the driver-core tree

Hi all,

Today's linux-next merge of the rust tree got a conflict in:

  rust/kernel/platform.rs

between commit:

  f0a68a912c67 ("rust: platform: use generic device drvdata accessors")

from the driver-core tree and commits:

  fcad9bbf9e1a ("rust: enable `clippy::ptr_as_ptr` lint")
  12717ebeffcf ("rust: types: add FOREIGN_ALIGN to ForeignOwnable")

from the rust tree.

I fixed it up (I just used the former) 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped