linux-kernel - linux-next: manual merge of the amdgpu tree with Linus' 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: <20200825113545.6e8d3a4a@canb.auug.org.au>
Date:   Tue, 25 Aug 2020 11:35:45 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Luben Tuikov <luben.tuikov@....com>,
        Aaron Ma <aaron.ma@...onical.com>
Subject: linux-next: manual merge of the amdgpu tree with Linus' tree

Hi all,

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

  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

between commit:

  3b2e973dff59 ("drm/amd/display: add dmcub check on RENOIR")

from Linus' tree and commit:

  4a580877bdcb ("drm/amdgpu: Get DRM dev from adev by inline-f")

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/amdgpu_dm/amdgpu_dm.c
index df9338257ae0,785f21ea35df..000000000000
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -1383,8 -1389,8 +1389,8 @@@ static int dm_late_init(void *handle
  	struct dmcu *dmcu = NULL;
  	bool ret = true;
  
 -	if (!adev->dm.fw_dmcu)
 +	if (!adev->dm.fw_dmcu && !adev->dm.dmub_fw)
- 		return detect_mst_link_for_all_connectors(adev->ddev);
+ 		return detect_mst_link_for_all_connectors(adev_to_drm(adev));
  
  	dmcu = adev->dm.dc->res_pool->dmcu;
  

Content of type "application/pgp-signature" skipped