* linux-next: manual merge of the tip tree with the bcachefs tree
@ 2025-05-26 4:42 Stephen Rothwell
2025-05-27 23:23 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-26 4:42 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Kent Overstreet
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
fs/bcachefs/clock.c
between commit:
881e64bc3a17 ("bcachefs: bch2_kthread_io_clock_wait_once()")
from the bcachefs tree and commit:
aad823aa3a7d ("treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_on_stack()")
from the tip tree.
I fixed it up (the former removed a line updated by the latter, so I
just used that) 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 tip tree with the bcachefs tree
2025-05-26 4:42 linux-next: manual merge of the tip tree with the bcachefs tree Stephen Rothwell
@ 2025-05-27 23:23 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-05-27 23:23 UTC (permalink / raw)
To: Kent Overstreet
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1007 bytes --]
Hi all,
On Mon, 26 May 2025 14:42:04 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> fs/bcachefs/clock.c
>
> between commit:
>
> 881e64bc3a17 ("bcachefs: bch2_kthread_io_clock_wait_once()")
>
> from the bcachefs tree and commit:
>
> aad823aa3a7d ("treewide, timers: Rename destroy_timer_on_stack() as timer_destroy_on_stack()")
>
> from the tip tree.
>
> I fixed it up (the former removed a line updated by the latter, so I
> just used that) 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.
This is now a conflict between the bcachefs tree and Linus' 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-27 23:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-26 4:42 linux-next: manual merge of the tip tree with the bcachefs tree Stephen Rothwell
2025-05-27 23:23 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox