Re: linux-next: manual merge of the char-misc tree with the regulator-fixes tree

Greg KH
2025-03-17T13:57:53Z

On Mon, Mar 17, 2025 at 06:18:43PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/regulator/dummy.c
>
> between commit:
>
> 8619909b38ee ("regulator: dummy: force synchronous probing")
>
> from the regulator-fixes tree and commit:
>
> dcd2a9a5550e ("regulator: dummy: convert to use the faux device interface")
>
> from the char-misc tree.
>
> I fixed it up (I just used the latter - since that seems to always use
> synchronous probing) 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.

Resolution sounds good to me, thanks!

greg k-h