Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Geert,

On Friday 16 Jun 2017 10:03:57 Geert Uytterhoeven wrote:
> On Thu, Jun 15, 2017 at 8:54 PM, Laurent Pinchart wrote:
> > The following changes implement display support for the R-Car H3 ES2.0.
> > They have been split in three distinct branches:
>
> Thanks for your branches!
> 
> > - tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top
> > of topic/r8a7795es2-integration
> 
> When merging this into next-20170616, there are lots of conflicts.
> Most are due to your tag being based on a one-month old version of
> renesas-devel.
> 
> As the relevant DT changes in topic/r8a7795es2-integration have been applied
> to renesas-devel, you could rebase on top of the latter.

Do you mean renesas-devel-20170616-v4.12-rc5 ? I don't want to pull the whole 
renesas-drivers tree as a base for my development branches, I'd prefer keeping 
the out-of-mainline dependencies as small as possible.

> > - tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU
> > and is based on top of sh-pfc-for-v4.13-tag1
> 
> Merges cleanly into next-20170616.
> 
> > - tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on
> > top of v4.12-rc1
> 
> When merging this into next-20170616, there are two conflicts, in
> drivers/media/platform/vsp1/vsp1_dl.c and include/media/vsp1.h.

-- 
Regards,

Laurent Pinchart