* linux-next: manual merge of the rust tree with the vfs-brauner, driver-core trees
@ 2025-07-15 8:09 Stephen Rothwell
2025-07-15 10:29 ` Miguel Ojeda
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-07-15 8:09 UTC (permalink / raw)
To: Miguel Ojeda, Christian Brauner, Greg KH, Danilo Krummrich,
Rafael J. Wysocki
Cc: Alice Ryhl, Krishna Ketan Rai, Linux Kernel Mailing List,
Linux Next Mailing List, Remo Senekowitsch
[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]
Hi all,
Today's linux-next merge of the rust tree got a conflict in:
rust/helpers/helpers.c
between commits:
6efbf978891b ("poll: rust: allow poll_table ptrs to be null")
a2801affa710 ("rust: device: Create FwNode abstraction for accessing device properties")
from the vfs-brauner, driver-core trees and commit:
8ffb945647f8 ("rust: helpers: sort includes alphabetically")
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.
--
Cheers,
Stephen Rothwell
diff --cc rust/helpers/helpers.c
index 2d2ea06000e9,d3867d09e356..000000000000
--- a/rust/helpers/helpers.c
+++ b/rust/helpers/helpers.c
@@@ -28,13 -28,10 +28,13 @@@
#include "kunit.c"
#include "mm.c"
#include "mutex.c"
+#include "of.c"
#include "page.c"
- #include "platform.c"
#include "pci.c"
#include "pid_namespace.c"
+ #include "platform.c"
+#include "poll.c"
+#include "property.c"
#include "rbtree.c"
#include "rcu.c"
#include "refcount.c"
[-- 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 vfs-brauner, driver-core trees
2025-07-15 8:09 linux-next: manual merge of the rust tree with the vfs-brauner, driver-core trees Stephen Rothwell
@ 2025-07-15 10:29 ` Miguel Ojeda
0 siblings, 0 replies; 2+ messages in thread
From: Miguel Ojeda @ 2025-07-15 10:29 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Miguel Ojeda, Christian Brauner, Greg KH, Danilo Krummrich,
Rafael J. Wysocki, Alice Ryhl, Krishna Ketan Rai,
Linux Kernel Mailing List, Linux Next Mailing List,
Remo Senekowitsch
On Tue, Jul 15, 2025 at 10:09 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the rust tree got a conflict in:
>
> rust/helpers/helpers.c
>
> between commits:
>
> 6efbf978891b ("poll: rust: allow poll_table ptrs to be null")
> a2801affa710 ("rust: device: Create FwNode abstraction for accessing device properties")
>
> from the vfs-brauner, driver-core trees and commit:
>
> 8ffb945647f8 ("rust: helpers: sort includes alphabetically")
>
> from the rust tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
Looks good, thanks!
Cheers,
Miguel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-07-15 10:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-15 8:09 linux-next: manual merge of the rust tree with the vfs-brauner, driver-core trees Stephen Rothwell
2025-07-15 10:29 ` Miguel Ojeda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).