Am Montag, den 19.09.2016, 17:37 +1000 schrieb Dave Airlie:
> On 19 September 2016 at 17:31, Philipp Zabel <p.zabel@xxxxxxxxxxxxxx> wrote:
> > Hi Dave,
> >
> > please consider merging this tag containing the latest active plane
> > reconfiguration patches, several fixes and cleanups, and image
> > conversion support for the V4L2 drivers to build upon.
> >
> > The active plane reconfiguration patch (v4) will conflict with the v2
> > patch that already went into v4.8-rc5 to fix a regression. I have not
> > yet included a backmerge with this tag, because that would mean also
> > pulling in v4.8-rc3. Please let me know if I also should prepare a pull
> > request containing the merges.
>
> fatal: unable to connect to git.pengutronix.de:
> git.pengutronix.de[0: 5.9.183.235]: errno=Connection refused
>
> temporary?
Temporary, sorry for the inconvenience. I've just double-checked it
works again.
> How conflicty is the backmerge, might be nice to just post an extra
> branch for reference if it's too messy..
I have pushed a branch imx-drm/merge for reference:
git://git.pengutronix.de/git/pza/linux.git refs/heads/imx-drm/merge
There is one hunk that needed manual intervention because commit
a474478642d5 ("drm/imx: fix crtc vblank state regression") is not
contained in imx-drm/next.
> I probably won't get to a backmerge to -next this week.
>
> Dave.
regards
Philipp
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
