Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rob Clark <robdclark@gmail.com>,
	Sean Paul <seanpaul@chromium.org>, Dave Airlie <airlied@linux.ie>,
	DRI <dri-devel@lists.freedesktop.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Sam Ravnborg <sam@ravnborg.org>,
	Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: Re: linux-next: manual merge of the drm-msm tree with the drm tree
Date: Wed, 14 Aug 2019 13:01:52 +1000
Message-ID: <20190814130152.129e86d1@canb.auug.org.au> (raw)
In-Reply-To: <20190814125859.35c1a2ca@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]

Hi all,

On Wed, 14 Aug 2019 12:58:59 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the drm-msm tree got a conflict in:
> 
>   drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> 
> between commit:
> 
>   e78ad7654179 ("drm/msm: Use drm_gem_fb_prepare_fb")
> 
> from the drm tree and commit:
> 
>   ddc73f32ba95 ("drm/msm: drop use of drmP.h")
> 
> from the drm-msm 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/msm/disp/dpu1/dpu_plane.c
> index 8cf0b8a4ed03,cd6e9bb1fedf..000000000000
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
> @@@ -10,9 -21,9 +10,10 @@@
>   #include <linux/debugfs.h>
>   #include <linux/dma-buf.h>
>   
> - #include <drm/drm_damage_helper.h>
>   #include <drm/drm_atomic_uapi.h>
>  +#include <drm/drm_gem_framebuffer_helper.h>
> + #include <drm/drm_damage_helper.h>
> + #include <drm/drm_file.h>
>   
>   #include "msm_drv.h"
>   #include "dpu_kms.h"

Also in file

  drivers/gpu/drm/msm/msm_atomic.c

with resolution:

diff --cc drivers/gpu/drm/msm/msm_atomic.c
index 169d5f915e68,20387be1b810..000000000000
--- a/drivers/gpu/drm/msm/msm_atomic.c
+++ b/drivers/gpu/drm/msm/msm_atomic.c
@@@ -5,7 -4,19 +5,8 @@@
   */
  
  #include <drm/drm_atomic_uapi.h>
 +#include <drm/drm_gem_framebuffer_helper.h>
+ #include <drm/drm_vblank.h>
  
  #include "msm_drv.h"
  #include "msm_gem.h"

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-14  2:58 Stephen Rothwell
2019-08-14  3:01 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-12-10  3:03 Stephen Rothwell
2018-07-23  2:40 Stephen Rothwell
2017-08-03  3:03 Stephen Rothwell

Reply instructions:

You may reply publically 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=20190814130152.129e86d1@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=airlied@linux.ie \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=robdclark@gmail.com \
    --cc=sam@ravnborg.org \
    --cc=seanpaul@chromium.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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org linux-next@archiver.kernel.org
	public-inbox-index linux-next


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/ public-inbox