From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0CB337497; Mon, 8 Jan 2024 00:14:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="OmsTBqF3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704672894; bh=037L4Bx9N+1mGd2j8MWjXO0307K1Ky4m2b0KGWg3Ki4=; h=Date:From:To:Cc:Subject:From; b=OmsTBqF3bIjUT99Rllsfo2snosICcCsQ6sj3p+4AS6+xGUpGG/ohO7cdEGBazQH4j FVKehnO4OEMo16FBlVhbk0wPr1f+q2A7m8n9OpvMjogj3TlxsdHLJKEaUxUdmAJVy2 PfgBUNuCfK75gF0gHCvURQ6NHAyn5nEJR9UmZli4xketp9bqujkP1NCfTE41MrxtkT UEt7BOh7Mko8Sp7XXFpZXFj9JsQOq9E3UPHcMfXeoTp3h/4JVGq+C2betAPic7uFf0 w/HwVbC7qYNOmgZy3cZpOtpCN+Y/X3kVJxOd9WxuY0KM7aZ2S6asWbx/4JVOSTxMX7 HE8tSVNuKMaOg== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T7ZM10SZmz4wdB; Mon, 8 Jan 2024 11:14:53 +1100 (AEDT) Date: Mon, 8 Jan 2024 11:14:51 +1100 From: Stephen Rothwell To: Dave Airlie , DRI Cc: Alex Deucher , Imre Deak , Linux Kernel Mailing List , Linux Next Mailing List , Wade Wang , Wayne Lin Subject: linux-next: manual merge of the drm tree with Linus' tree Message-ID: <20240108111451.67c34a93@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/d75n8xzFTcdrovT1=A9bA_h"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/d75n8xzFTcdrovT1=A9bA_h Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm tree got a conflict in: drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c between commit: 9cdef4f72037 ("drm/amd/display: pbn_div need be updated for hotplug event= ") from Linus' tree and commit: 191dc43935d1 ("drm/dp_mst: Store the MST PBN divider value in fixed point= format") from the drm tree. I fixed it up (I think, 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 73dd4bc870dc,54861136dafd..000000000000 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@@ -6916,7 -7007,8 +7009,7 @@@ static int dm_encoder_helper_atomic_che if (IS_ERR(mst_state)) return PTR_ERR(mst_state); =20 - mst_state->pbn_div =3D dm_mst_get_pbn_divider(aconnector->mst_root->dc_l= ink); - if (!mst_state->pbn_div.full) - mst_state->pbn_div.full =3D dfixed_const(dm_mst_get_pbn_divider(aconnec= tor->mst_root->dc_link)); ++ mst_state->pbn_div.full =3D dfixed_const(dm_mst_get_pbn_divider(aconnect= or->mst_root->dc_link)); =20 if (!state->duplicated) { int max_bpc =3D conn_state->max_requested_bpc; --Sig_/d75n8xzFTcdrovT1=A9bA_h Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWbPnsACgkQAVBC80lX 0GyFVgf8DNuxxfYi5lerGxqQLb82OBymXJLZcvRwzmabkrIqRBrtIkkxVg+mz09z s2+FF+0V87HFR3iO0E71WZr2oHZ/1nhQQNT6H5BKp7AcVj3n/xHcSkUlzvp8MfCs mthwSP+dobQJMgr9Co9dwHnA+gCXh8vAMXZ+A/5pH3kj6J5AGJmDRmZXrn6SVLK8 dLRFykwOrE3DkaDtN11pRdVOhrl7+YvPc1+y/nzRQok+aWwwmxmNG1wCEX6Bp22p zxP/tft4zJaJw+CAD/hQQk//GDcEuMKAuixCMp376V1agqYHPmnOBhQgFJ0K+Cpc 5u/A/WEXlwokNx0Nrfa9mX1bxR+rfg== =F69V -----END PGP SIGNATURE----- --Sig_/d75n8xzFTcdrovT1=A9bA_h--