Messages in this thread | | | From | "Rafael J. Wysocki" <> | Date | Tue, 1 Dec 2020 17:30:03 +0100 | Subject | Re: [GIT PULL] cpupower update for Linux 5.11-rc1 |
| |
On Mon, Nov 30, 2020 at 10:47 PM Shuah Khan <skhan@linuxfoundation.org> wrote: > > Hi Rafael, > > Please pull the following cpupower update for Linux 5.11-rc1. > > This cpupower update for Linux 5.11-rc1 consists of a change to provide > online and offline CPU information. This change makes it easier to keep > track of offline cpus whose cpuidle or cpufreq property aren't changed > when updates are made to online cpus.
Pulled, thanks!
> Please note that there is a conflict in > > tools/power/cpupower/utils/helpers/misc.c > > between commit: > > 748f0d70087c ("cpupower: Provide online and offline CPU information") > > from the cpupower tree and commit: > > 8113ab20e850 ("tools/power/cpupower: Read energy_perf_bias from sysfs") > > from the tip tree. > > Stephen fixed it up and can carry the fix. Hope this works.
Thanks for the notice!
The conflict will now move to the PM tree merges I suppose.
| |