* linux-next: manual merge of the char-misc tree with the regulator-fixes tree
@ 2025-03-17 7:18 Stephen Rothwell
2025-03-17 13:56 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2025-03-17 7:18 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Mark Brown, Liam Girdwood
Cc: Christian Eggers, Greg Kroah-Hartman, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 825 bytes --]
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.
--
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 char-misc tree with the regulator-fixes tree
2025-03-17 7:18 linux-next: manual merge of the char-misc tree with the regulator-fixes tree Stephen Rothwell
@ 2025-03-17 13:56 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2025-03-17 13:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Mark Brown, Liam Girdwood, Christian Eggers,
Linux Kernel Mailing List, Linux Next Mailing List
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-17 13:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-17 7:18 linux-next: manual merge of the char-misc tree with the regulator-fixes tree Stephen Rothwell
2025-03-17 13:56 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox