* linux-next: manual merge of the kselftest tree with the pm tree
@ 2022-09-06 6:03 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2022-09-06 6:03 UTC (permalink / raw)
To: Shuah Khan, Rafael J. Wysocki
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Meng Li,
Perry Yuan, Rafael J. Wysocki, Shuah Khan
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-09-06 6:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-06 6:03 linux-next: manual merge of the kselftest tree with the pm tree Stephen Rothwell
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).