From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Daniel Lezcano <daniel.lezcano@linaro•org>,
Zhang Rui <rui.zhang@intel•com>,
Eduardo Valentin <edubezval@gmail•com>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Willy Wolff <willy.mh.wolff.ml@gmail•com>,
Thara Gopinath <thara.gopinath@linaro•org>
Subject: Re: linux-next: manual merge of the tip tree with the thermal tree
Date: Wed, 1 Apr 2020 11:42:34 +1100 [thread overview]
Message-ID: <20200401114234.7b34320b@canb.auug.org.au> (raw)
In-Reply-To: <20200325133240.50370c2f@canb.auug.org.au>
[-- 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 --]
prev parent reply other threads:[~2020-04-01 0:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200401114234.7b34320b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=daniel.lezcano@linaro$(echo .)org \
--cc=edubezval@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=rui.zhang@intel$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=thara.gopinath@linaro$(echo .)org \
--cc=willy.mh.wolff.ml@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox