From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936605AbdJRKII (ORCPT ); Wed, 18 Oct 2017 06:08:08 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:49630 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932870AbdJRKIH (ORCPT ); Wed, 18 Oct 2017 06:08:07 -0400 Date: Wed, 18 Oct 2017 11:08:02 +0100 From: Mark Brown To: Alex Deucher , Vijendar Mukunda , Rex Zhu , Daniel Vetter , Intel Graphics , DRI , Liam Girdwood Cc: Linux-Next Mailing List , Linux Kernel Mailing List , alsa-devel@alsa-project.org Subject: Re: linux-next: manual merge of the sound-asoc tree with the drm-misc tree Message-ID: <20171018100802.4eiin6bhsj6wir75@sirena.co.uk> References: <20171018095733.2ffvg6ty6kn2lfdf@sirena.co.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6odhojqr3rupvxx3" Content-Disposition: inline In-Reply-To: <20171018095733.2ffvg6ty6kn2lfdf@sirena.co.uk> X-Cookie: Put your trust in those who are worthy. User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --6odhojqr3rupvxx3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Oct 18, 2017 at 10:57:33AM +0100, Mark Brown wrote: > 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. Actually I'm just going to discard the AMD drivers from the ASoC tree because the build produces reams of errors like those below, the changes to move the chip type definitions around weren't fully baked. Please resend both the pull request and the patches with this fixed. Note also that if you're basing something on Linus' tree you should use a tagged release rather than just a random commit. In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: nested redefinition of 'enum amd_asic_type' enum amd_asic_type { ^ /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:33:6: error: redeclaration of 'enum amd_asic_type' In file included from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/../include/amd_shared.h:26:0, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu.h:51, from /home/broonie/tmpfs/next/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:31: /home/broonie/tmpfs/next/include/drm/amd_asic_type.h:28:6: note: originally defined here enum amd_asic_type { ^ --6odhojqr3rupvxx3 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAlnnKAEACgkQJNaLcl1U h9AXYAf9FH24hnfvF42jW0fFpPhZXrac4pf9j//QczzcPStmLcZqmbd4nb9DgmBw qdGmVArFX6y+tcAdKLOqFIEPolZ9wDD9NTUtK9i6YAZa+U0Lr8Mr+pY2kq3BlJNW XEgCAEqfLJbeV+SBg4J9UogRXtwwJqDK8KHx9q/EU5yxnkE3ayqqKqlP+sc69dWB eonSxPcJ/Dyb0HpGqkXoAHO1MNnZmE5/44HGHqw7zZjCLeIdC9UFhNF6zPt4guC+ Re2iAPdn77QOpmjgRGZwKPyE8HP1C++reWocucqwslHu2KnLrxlDHdL/H+l+OkXs lhYC7w3CdjK0f4pWkrGQHlcCowCTSw== =tah9 -----END PGP SIGNATURE----- --6odhojqr3rupvxx3--