Hi Geert,
On Tuesday 02 May 2017 11:24:11 Geert Uytterhoeven wrote:
> On Mon, Mar 6, 2017 at 1:32 AM, Laurent Pinchart wrote:
> > Please find two pull requests below for renesas-drivers (in a single
> > e-mail, lucky you :-)).
> >
> > The second tag contains DT changes only and is based on Simon's latest
> > devel branch. Nothing special there, it should just not make it to
> > mainline before the driver changes get accepted.
> >
> > The following changes since commit
2537532db23bdd9ecd2c1c956ac430a9a08738a8:
> > Merge branch 'arm64-dt-for-v4.12' into devel (2017-03-02 16:02:44 +0100)
> >
> > are available in the git repository at:
> > git://linuxtv.org/pinchartl/media.git tags/drm-next-dt-v3-20170306
> >
> > for you to fetch changes up to 111e8637fa9ad8261c25d437255c16f8e4e57116:
> > ARM: shmobile: dts: Switch to panel-lvds bindings for Mitsubishi panels
> >
> > (2017-03-06 02:12:00 +0200)
>
> Dropped, too many conflicts ("Simon's latest devel branch", from 8 weeks
> ago).
I thought the whole purpose of providing separate branches for DT integration
was to allow you to resolve the conflicts ?
--
Regards,
Laurent Pinchart
