* linux-next: manual merge of the tip tree with the thermal tree
@ 2020-03-25 2:32 Stephen Rothwell
2020-04-01 0:42 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2020-03-25 2:32 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Daniel Lezcano, Zhang Rui, Eduardo Valentin
Cc: Linux Next Mailing List, Linux Kernel Mailing List, Willy Wolff,
Thara Gopinath
[-- Attachment #1: Type: text/plain, Size: 853 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/thermal/cpufreq_cooling.c
between commit:
ff44f672d741 ("thermal/drivers/cpufreq_cooling: Fix return of cpufreq_set_cur_state")
from the thermal tree and commit:
f12e4f66ab6a ("thermal/cpu-cooling: Update thermal pressure in case of a maximum frequency capping")
from the tip tree.
I fixed it up (the latter seems to include the former, so I just used
the latter) 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 thermal tree
2020-03-25 2:32 linux-next: manual merge of the tip tree with the thermal tree Stephen Rothwell
@ 2020-04-01 0:42 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2020-04-01 0:42 UTC (permalink / raw)
To: Daniel Lezcano, Zhang Rui, Eduardo Valentin
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Linux Next Mailing List, Linux Kernel Mailing List, Willy Wolff,
Thara Gopinath
[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]
Hi all,
On Wed, 25 Mar 2020 13:32:40 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> drivers/thermal/cpufreq_cooling.c
>
> between commit:
>
> ff44f672d741 ("thermal/drivers/cpufreq_cooling: Fix return of cpufreq_set_cur_state")
>
> from the thermal tree and commit:
>
> f12e4f66ab6a ("thermal/cpu-cooling: Update thermal pressure in case of a maximum frequency capping")
>
> from the tip tree.
>
> I fixed it up (the latter seems to include the former, so I just used
> the latter) 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 thermal 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:[~2020-04-01 0:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-25 2:32 linux-next: manual merge of the tip tree with the thermal tree Stephen Rothwell
2020-04-01 0:42 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.