Re: linux-next: manual merge of the tip tree with the cpupower tree

On 11/22/20 7:42 PM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the tip tree got 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: 8113ab

linux-next: manual merge of the tip tree with the cpupower tree

Hi all, Today's linux-next merge of the tip tree got 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_bi