From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm tree with the drm-fixes tree Date: Fri, 5 Jul 2019 12:50:44 +1000 Message-ID: <20190705125044.12c10552@canb.auug.org.au> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/8gZKdzyZ.MTIruRd3tsn7Vg"; protocol="application/pgp-signature" Return-path: Sender: linux-kernel-owner@vger.kernel.org To: Dave Airlie , DRI Cc: Linux Next Mailing List , Linux Kernel Mailing List , Trigger Huang , Alex Deucher List-Id: dri-devel@lists.freedesktop.org --Sig_/8gZKdzyZ.MTIruRd3tsn7Vg 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/amdgpu/gfx_v9_0.c between commit: 25f09f858835 ("drm/amdgpu/gfx9: use reset default for PA_SC_FIFO_SIZE") from the drm-fixes tree and commit: 1bff7f6c679f ("drm/amdgpu: RLC to program regs for Vega10 SR-IOV") from the drm tree. I fixed it up (the former removes the code modified 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. --=20 Cheers, Stephen Rothwell --Sig_/8gZKdzyZ.MTIruRd3tsn7Vg Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0euwQACgkQAVBC80lX 0GwLyAf8D4+tM3UyxYIbHzXNp9lsJcqI9EKjnUB2NwnC8c1FqTZA0Bd5HYv12wfT UxqGMCmUXZm8r12CFt8b48WFofS2q8sMSGJh0l/IyR+D3xPjxX/OWhXkAzDbiSfL OwBwlqDoazWuzfjatt5l4kNYE+R6K756TgHUvf4/PqQ0xhaI0CZ2PsfFPmMER4a7 5d5Oq9V95vZwI0H1cipa3EvL0nHBB0KWhBRvsLI13ImT0WrC3QOkhWQ54CrpIaL0 QBcO0ybBRNxeERjb20hYMSzvbaQw4jEolefXdklbxYX66hAwWSYN9Wc3+Exaqflx jK4R8KSdDqhBgNX2EHrNQENhzvNazg== =Jo7x -----END PGP SIGNATURE----- --Sig_/8gZKdzyZ.MTIruRd3tsn7Vg--