From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: linux-next: manual merge of the drm-misc tree with the amdgpu
 tree
Date: Mon, 17 Jun 2019 13:25:04 +1000
Message-ID: <20190617132504.2cf70caf@canb.auug.org.au>
References: <20190612114615.69a78655@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/pBbuo/mx.9ub.bLi2Nl_21V"; protocol="application/pgp-signature"
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20190612114615.69a78655@canb.auug.org.au>
Sender: linux-kernel-owner@vger.kernel.org
To: Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics <intel-gfx@lists.freedesktop.org>, DRI <dri-devel@lists.freedesktop.org>, Alex Deucher <alexdeucher@gmail.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Charlene Liu <charlene.liu@amd.com>, Sam Ravnborg <sam@ravnborg.org>, Dave Airlie <airlied@linux.ie>
List-Id: intel-gfx@lists.freedesktop.org

--Sig_/pBbuo/mx.9ub.bLi2Nl_21V
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Wed, 12 Jun 2019 11:46:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Hi all,
>=20
> Today's linux-next merge of the drm-misc tree got a conflict in:
>=20
>   drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
>=20
> between commit:
>=20
>   c7c7192c56d2 ("drm/amd/display: add audio related regs")
>=20
> from the amdgpu tree and commit:
>=20
>   4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h")
>=20
> from the drm-misc tree.
>=20
> 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.
>=20
> --=20
> Cheers,
> Stephen Rothwell
>=20
> diff --cc drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> index d43d5d924c19,9b078a71de2e..000000000000
> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
> @@@ -22,7 -22,9 +22,10 @@@
>    * Authors: AMD
>    *
>    */
> +=20
> + #include <linux/slab.h>
> +=20
>  +#include "../dc.h"
>   #include "reg_helper.h"
>   #include "dce_audio.h"
>   #include "dce/dce_11_0_d.h"

This is now a conflict between the drm tree and the amdgpu tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/pBbuo/mx.9ub.bLi2Nl_21V
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl0HCBAACgkQAVBC80lX
0GxBBwf8CoFB80pNJP6cX+YNjV2ZKobvI1VFUmzmEog2O/V8WCoCN5WupKfm4Gf1
Ea0TELkV5+6TnObptjAVgBjxl0hSYJGZ56ncNpQl8Q8a8eo0L4PvEY4EF9CP2DBG
rCY7GHqLnoh6vl6h4kXgiw1qS6EPsAauW/Dw2BSGpbEq9kj+o9v9VnloPBaNeFvy
pDKoxqHXfQcq+srgFOxAR0LiigcJYBxXqLXp/YehfGRRP4FkHk94OnHFx8jM08JG
7TZPMfvkxCxMIJ1pt0LroHy0v5TUe7Q/L/15UfC6E59WHChNaPWLKk0X6/h/lgHX
TgCvoFy9JxWfxUTj2JH49z7N4HEkqQ==
=glaT
-----END PGP SIGNATURE-----

--Sig_/pBbuo/mx.9ub.bLi2Nl_21V--