From: Stephen Rothwell <sfr@canb.auug.org.au>
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>
Subject: Re: linux-next: manual merge of the drm-misc tree with the amdgpu tree
Date: Mon, 17 Jun 2019 13:25:04 +1000 [thread overview]
Message-ID: <20190617132504.2cf70caf@canb.auug.org.au> (raw)
In-Reply-To: <20190612114615.69a78655@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1447 bytes --]
Hi all,
On Wed, 12 Jun 2019 11:46:15 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the drm-misc tree got a conflict in:
>
> drivers/gpu/drm/amd/display/dc/dce/dce_audio.c
>
> between commit:
>
> c7c7192c56d2 ("drm/amd/display: add audio related regs")
>
> from the amdgpu tree and commit:
>
> 4fc4dca8320e ("drm/amd: drop use of drmp.h in os_types.h")
>
> from the drm-misc 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/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
> *
> */
> +
> + #include <linux/slab.h>
> +
> +#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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2019-06-17 3:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-12 1:46 linux-next: manual merge of the drm-misc tree with the amdgpu tree Stephen Rothwell
2019-06-17 3:25 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-11-03 3:21 Stephen Rothwell
2020-11-09 2:16 ` Stephen Rothwell
2020-10-28 1:06 Stephen Rothwell
2020-11-05 0:39 ` Stephen Rothwell
2020-08-26 0:18 Stephen Rothwell
2020-09-03 7:06 ` Stephen Rothwell
2019-10-28 2:24 Stephen Rothwell
2019-08-07 3:09 Stephen Rothwell
2019-05-21 0:38 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190617132504.2cf70caf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=airlied@linux.ie \
--cc=alexdeucher@gmail.com \
--cc=charlene.liu@amd.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sam@ravnborg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).