linux-kernel - linux-next: manual merge of the kselftest tree with the pm 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>] [day] [month] [year] [list]

Message-ID: <20220906160342.0dbb0f5f@canb.auug.org.au>
Date:   Tue, 6 Sep 2022 16:03:42 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Shuah Khan <shuah@...nel.org>,
        "Rafael J. Wysocki" <rjw@...ysocki.net>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Meng Li <li.meng@....com>, Perry Yuan <Perry.Yuan@....com>,
        "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
        Shuah Khan <skhan@...uxfoundation.org>
Subject: linux-next: manual merge of the kselftest tree with the pm tree

Hi all,

Today's linux-next merge of the kselftest tree got a conflict in:

  drivers/cpufreq/amd-pstate.c

between commit:

  d8bee41db83e ("cpufreq: amd-pstate: fix white-space")

from the pm tree and commit:

  8c766b24ee62 ("cpufreq: amd-pstate: Expose struct amd_cpudata")

from the kselftest tree.

I fixed it up (some of the code updated by the former has been moved,
and fixed up, by 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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped