linux-next: manual merge of the amdgpu tree with the pm tree
Rafael J. Wysocki
rjw at rjwysocki.net
Fri May 8 13:57:05 UTC 2020
On Friday, May 8, 2020 6:34:57 AM CEST Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the amdgpu tree got a conflict in:
> between commit:
> e07515563d01 ("PM: sleep: core: Rename DPM_FLAG_NEVER_SKIP")
> from the pm tree and commit:
> 500bd19a7e5d ("drm/amdgpu: only set DPM_FLAG_NEVER_SKIP for legacy ATPX BOCO")
> from the amdgpu 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 for resolving this, the resolution looks good to me.
More information about the dri-devel