Re: linux-next: manual merge of the tip tree with the mailbox tree

[Stephen Rothwell]

Hi all,

On Mon, 3 Mar 2025 14:46:37 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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: pgpuEuB0tOfhV.pgp
Description: OpenPGP digital signature