* linux-next: manual merge of the tip tree with the mailbox tree
@ 2025-03-03 3:46 Stephen Rothwell
2025-03-26 5:04 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-03 3:46 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Jassi Brar
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Nam Cao
[-- Attachment #1: Type: text/plain, Size: 758 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/mailbox/mailbox.c
between commit:
791d7e70a9f4 ("mailbox: Switch to use hrtimer_setup()")
from the mailbox tree and commit:
c158a29c5c5b ("mailbox: Switch to use hrtimer_setup()")
from the tip tree.
I fixed it up (I just used the former - only a whitespace difference) 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 mailbox tree
2025-03-03 3:46 linux-next: manual merge of the tip tree with the mailbox tree Stephen Rothwell
@ 2025-03-26 5:04 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-26 5:04 UTC (permalink / raw)
To: Jassi Brar
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Linux Kernel Mailing List, Linux Next Mailing List, Nam Cao
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
Hi all,
On Mon, 3 Mar 2025 14:46:37 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/mailbox/mailbox.c
>
> between commit:
>
> 791d7e70a9f4 ("mailbox: Switch to use hrtimer_setup()")
>
> from the mailbox tree and commit:
>
> c158a29c5c5b ("mailbox: Switch to use hrtimer_setup()")
>
> from the tip tree.
>
> I fixed it up (I just used the former - only a whitespace difference) 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 Linus' tree and the mailbox 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-03-26 5:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-03 3:46 linux-next: manual merge of the tip tree with the mailbox tree Stephen Rothwell
2025-03-26 5:04 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox