From: Linus Torvalds <torvalds@linux-foundation.org>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Ingo Molnar <mingo@kernel.org>,
Thara Gopinath <thara.gopinath@linaro.org>,
Willy Wolff <willy.mh.wolff.ml@gmail.com>,
Viresh Kumar <viresh.kumar@linaro.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>
Cc: Zhang Rui <rui.zhang@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux PM mailing list <linux-pm@vger.kernel.org>,
Amit Kucheria <amit.kucheria@linaro.org>
Subject: Re: [GIT PULL] thermal for v5.7-rc1
Date: Tue, 7 Apr 2020 20:14:41 -0700 [thread overview]
Message-ID: <CAHk-=wjkEYLViZ6zBLaWaiTXZ4RqcR4DHkkY_PKJZ2-0HAX_Pw@mail.gmail.com> (raw)
In-Reply-To: <49c5b834-362d-0569-32c5-76d366cb0a44@linaro.org>
On Tue, Apr 7, 2020 at 4:26 AM Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git
> tags/thermal-v5.7-rc1
Ho humm.
This caused a conflict between commit
f12e4f66ab6a ("thermal/cpu-cooling: Update thermal pressure in case
of a maximum frequency capping")
that came in through the scheduler updates from Ingo Molnar, and commit
ff44f672d741 ("thermal/drivers/cpufreq_cooling: Fix return of
cpufreq_set_cur_state")
from the thermal tree.
The conflict wasn't complicated, but the reason I mention it is that I
resolved it in a way that neither of those commits had done.
In particular, the thermal tree did
ret = freq_qos_update_request(..)
return ret < 0 ? ret : 0;
where that whole "return negative or zero" logic is new (it used to
return positive values, the fix was to return zero instead).
The scheduler tree did
ret = freq_qos_update_request(..)
if (ret > 0) {.. do thermal pressure thing ..}
return ret;
which obviously still returns that positive value.
My resolution to the conflict was to not take that return with a
conditional operation, but instead just add a
ret = 0;
to inside that thermal pressure if-statement, and avoid returning a
non-zero positive value that way.
I just wanted both sides to be aware of my non-traditional merge
resolution, and take a look.
Linus
next prev parent reply other threads:[~2020-04-08 3:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-07 11:26 [GIT PULL] thermal for v5.7-rc1 Daniel Lezcano
2020-04-08 3:14 ` Linus Torvalds [this message]
2020-04-08 10:53 ` Daniel Lezcano
2020-04-08 3:20 ` pr-tracker-bot
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='CAHk-=wjkEYLViZ6zBLaWaiTXZ4RqcR4DHkkY_PKJZ2-0HAX_Pw@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=amit.kucheria@linaro.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rui.zhang@intel.com \
--cc=thara.gopinath@linaro.org \
--cc=viresh.kumar@linaro.org \
--cc=willy.mh.wolff.ml@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).