* linux-next: manual merge of the rust-alloc tree with the mm-unstable tree
@ 2025-08-18 2:20 Stephen Rothwell
2025-09-08 7:55 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-08-18 2:20 UTC (permalink / raw)
To: Danilo Krummrich, Andrew Morton
Cc: Alice Ryhl, Linux Kernel Mailing List, Linux Next Mailing List,
Vitaly Wool
[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]
Hi all,
Today's linux-next merge of the rust-alloc tree got a conflict in:
rust/kernel/alloc.rs
between commit:
defab7872312 ("rust: add support for NUMA ids in allocations")
from the mm-unstable tree and commit:
1b1a946dc2b5 ("rust: alloc: specify the minimum alignment of each allocator")
from the rust-alloc 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.
--
Cheers,
Stephen Rothwell
diff --cc rust/kernel/alloc.rs
index b39c279236f5,907301334d8c..000000000000
--- a/rust/kernel/alloc.rs
+++ b/rust/kernel/alloc.rs
@@@ -164,7 -137,15 +164,15 @@@ impl NumaNode
/// - Implementers must ensure that all trait functions abide by the guarantees documented in the
/// `# Guarantees` sections.
pub unsafe trait Allocator {
+ /// The minimum alignment satisfied by all allocations from this allocator.
+ ///
+ /// # Guarantees
+ ///
+ /// Any pointer allocated by this allocator is guaranteed to be aligned to `MIN_ALIGN` even if
+ /// the requested layout has a smaller alignment.
+ const MIN_ALIGN: usize;
+
- /// Allocate memory based on `layout` and `flags`.
+ /// Allocate memory based on `layout`, `flags` and `nid`.
///
/// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
/// constraints (i.e. minimum size and alignment as specified by `layout`).
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the rust-alloc tree with the mm-unstable tree
2025-08-18 2:20 linux-next: manual merge of the rust-alloc tree with the mm-unstable tree Stephen Rothwell
@ 2025-09-08 7:55 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-09-08 7:55 UTC (permalink / raw)
To: Miguel Ojeda, Andrew Morton
Cc: Alice Ryhl, Linux Kernel Mailing List, Linux Next Mailing List,
Vitaly Wool, Danilo Krummrich
[-- Attachment #1: Type: text/plain, Size: 1992 bytes --]
Hi all,
On Mon, 18 Aug 2025 12:20:53 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the rust-alloc tree got a conflict in:
>
> rust/kernel/alloc.rs
>
> between commit:
>
> defab7872312 ("rust: add support for NUMA ids in allocations")
>
> from the mm-unstable tree and commit:
>
> 1b1a946dc2b5 ("rust: alloc: specify the minimum alignment of each allocator")
>
> from the rust-alloc 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/alloc.rs
> index b39c279236f5,907301334d8c..000000000000
> --- a/rust/kernel/alloc.rs
> +++ b/rust/kernel/alloc.rs
> @@@ -164,7 -137,15 +164,15 @@@ impl NumaNode
> /// - Implementers must ensure that all trait functions abide by the guarantees documented in the
> /// `# Guarantees` sections.
> pub unsafe trait Allocator {
> + /// The minimum alignment satisfied by all allocations from this allocator.
> + ///
> + /// # Guarantees
> + ///
> + /// Any pointer allocated by this allocator is guaranteed to be aligned to `MIN_ALIGN` even if
> + /// the requested layout has a smaller alignment.
> + const MIN_ALIGN: usize;
> +
> - /// Allocate memory based on `layout` and `flags`.
> + /// Allocate memory based on `layout`, `flags` and `nid`.
> ///
> /// On success, returns a buffer represented as `NonNull<[u8]>` that satisfies the layout
> /// constraints (i.e. minimum size and alignment as specified by `layout`).
This is now a conflict between the rust tree and the mm-unstable tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-08 7:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-18 2:20 linux-next: manual merge of the rust-alloc tree with the mm-unstable tree Stephen Rothwell
2025-09-08 7:55 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox