Messages in this thread | | | Date | Tue, 26 Jul 2022 12:39:49 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the amdgpu tree with the powerpc-fixes tree |
| |
Hi all,
Today's linux-next merge of the amdgpu tree got a conflict in:
drivers/gpu/drm/amd/display/Kconfig
between commits:
c653c591789b ("drm/amdgpu: Re-enable DCN for 64-bit powerpc")
from the powerpc-fixes tree and commit:
3876a8b5e241 ("drm/amd/display: Enable building new display engine with KCOV enabled")
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.
-- Cheers, Stephen Rothwell
diff --cc drivers/gpu/drm/amd/display/Kconfig index ec6771e87e73,96cbc87f7b6b..000000000000 --- a/drivers/gpu/drm/amd/display/Kconfig +++ b/drivers/gpu/drm/amd/display/Kconfig @@@ -6,7 -6,7 +6,7 @@@ config DRM_AMD_D bool "AMD DC - Enable new display engine" default y select SND_HDA_COMPONENT if SND_HDA_CORE - select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128) && !(KCOV_INSTRUMENT_ALL && KCOV_ENABLE_COMPARISONS) - select DRM_AMD_DC_DCN if (X86 || PPC64) ++ select DRM_AMD_DC_DCN if (X86 || PPC_LONG_DOUBLE_128) help Choose this option if you want to use the new display engine support for AMDGPU. This adds required support for Vega and
[unhandled content-type:application/pgp-signature] | |