* linux-next: manual merge of the rust tree with the security tree
@ 2024-12-16 4:35 Stephen Rothwell
2024-12-16 10:27 ` Miguel Ojeda
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-12-16 4:35 UTC (permalink / raw)
To: Miguel Ojeda, Paul Moore
Cc: Alice Ryhl, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/kernel/security.rs
between commit:
9c76eaf78488 ("rust: replace lsm context+len with lsm_context")
from the security tree and commit:
4724732dc2a8 ("rust: finish using custom FFI integer types")
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
[-- 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 tree with the security tree
2024-12-16 4:35 linux-next: manual merge of the rust tree with the security tree Stephen Rothwell
@ 2024-12-16 10:27 ` Miguel Ojeda
0 siblings, 0 replies; 2+ messages in thread
From: Miguel Ojeda @ 2024-12-16 10:27 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Miguel Ojeda, Paul Moore, Alice Ryhl, Linux Kernel Mailing List,
Linux Next Mailing List
On Mon, Dec 16, 2024 at 5:35 AM Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> I fixed it up (I just used the former) and can carry the fix as
That is indeed the correct resolution, thanks!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-16 10:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-16 4:35 linux-next: manual merge of the rust tree with the security tree Stephen Rothwell
2024-12-16 10:27 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox