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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <e66c627b-0666-ee4f-fc3e-57cb2ad98fb9@linuxfoundation.org>
Date:   Mon, 30 Nov 2020 13:53:24 -0700
From:   Shuah Khan <skhan@...uxfoundation.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Shuah Khan <shuah@...nel.org>,
        "Rafael J. Wysocki" <rafael@...nel.org>,
        Borislav Petkov <bp@...e.de>
Cc:     Brahadambal Srinivasan <latha@...ux.vnet.ibm.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: 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:
> 
>    8113ab20e850 ("tools/power/cpupower: Read energy_perf_bias from sysfs")
> 
> from the tip tree.
> 
> I fixed it up (see below) 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.
> 

Thanks. Fix looks good to me. I will mention it in my pull
request to Rafael.

thanks,
--Shuah