* linux-next: manual merge of the drm-nova tree with the configfs tree
@ 2025-05-13 3:55 Stephen Rothwell
2025-05-21 4:32 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-13 3:55 UTC (permalink / raw)
To: Danilo Krummrich, Andreas Hindborg
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1346 bytes --]
Hi all,
Today's linux-next merge of the drm-nova tree got a conflict in:
samples/rust/Makefile
between commit:
1bfb10505156 ("rust: configfs: add a sample demonstrating configfs usage")
from the configfs tree and commit:
96609a1969f4 ("samples: rust: add Rust auxiliary driver sample")
from the drm-nova 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 samples/rust/Makefile
index b3c9178d654a,6a466afd2a21..000000000000
--- a/samples/rust/Makefile
+++ b/samples/rust/Makefile
@@@ -8,7 -8,7 +8,8 @@@ obj-$(CONFIG_SAMPLE_RUST_DMA) += rust
obj-$(CONFIG_SAMPLE_RUST_DRIVER_PCI) += rust_driver_pci.o
obj-$(CONFIG_SAMPLE_RUST_DRIVER_PLATFORM) += rust_driver_platform.o
obj-$(CONFIG_SAMPLE_RUST_DRIVER_FAUX) += rust_driver_faux.o
+obj-$(CONFIG_SAMPLE_RUST_CONFIGFS) += rust_configfs.o
+ obj-$(CONFIG_SAMPLE_RUST_DRIVER_AUXILIARY) += rust_driver_auxiliary.o
rust_print-y := rust_print_main.o rust_print_events.o
[-- 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 drm-nova tree with the configfs tree
2025-05-13 3:55 linux-next: manual merge of the drm-nova tree with the configfs tree Stephen Rothwell
@ 2025-05-21 4:32 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-21 4:32 UTC (permalink / raw)
To: Andreas Hindborg, Dave Airlie
Cc: Danilo Krummrich, Linux Kernel Mailing List,
Linux Next Mailing List, DRI
[-- Attachment #1: Type: text/plain, Size: 1570 bytes --]
Hi all,
On Tue, 13 May 2025 13:55:21 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the drm-nova tree got a conflict in:
>
> samples/rust/Makefile
>
> between commit:
>
> 1bfb10505156 ("rust: configfs: add a sample demonstrating configfs usage")
>
> from the configfs tree and commit:
>
> 96609a1969f4 ("samples: rust: add Rust auxiliary driver sample")
>
> from the drm-nova 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 samples/rust/Makefile
> index b3c9178d654a,6a466afd2a21..000000000000
> --- a/samples/rust/Makefile
> +++ b/samples/rust/Makefile
> @@@ -8,7 -8,7 +8,8 @@@ obj-$(CONFIG_SAMPLE_RUST_DMA) += rust
> obj-$(CONFIG_SAMPLE_RUST_DRIVER_PCI) += rust_driver_pci.o
> obj-$(CONFIG_SAMPLE_RUST_DRIVER_PLATFORM) += rust_driver_platform.o
> obj-$(CONFIG_SAMPLE_RUST_DRIVER_FAUX) += rust_driver_faux.o
> +obj-$(CONFIG_SAMPLE_RUST_CONFIGFS) += rust_configfs.o
> + obj-$(CONFIG_SAMPLE_RUST_DRIVER_AUXILIARY) += rust_driver_auxiliary.o
>
> rust_print-y := rust_print_main.o rust_print_events.o
>
This is now a conflict between the drm tree and the configfs 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-05-21 4:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-13 3:55 linux-next: manual merge of the drm-nova tree with the configfs tree Stephen Rothwell
2025-05-21 4:32 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox