Hi Laurent,
On Mon, Mar 18, 2019 at 9:14 AM Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote:
> On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham
> <kieran.bingham+renesas@xxxxxxxxxxxxxxxx> wrote:
> > Please consider including this release in renesas-drivers.
>
> Thanks for your pull request!
>
> > The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:
> >
> > Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers
> >
> > for you to fetch changes up to 99deb47fa63bb9fc7bd691e358fea1c5bccc1da2:
> >
> > drm: rcar-du: Add group hooks for atomic-commit (2019-03-17 19:29:37 +0000)
>
> This has a merge conflict in drivers/gpu/drm/rcar-du/rcar_du_encoder.c
> with Laurent's pull request for
> git://linuxtv.org/pinchartl/media.git drm/du/lvds/dual-link~2
>
> > Laurent Pinchart (1):
> > drm: rcar-du: Support panels connected directly to the DPAD outputs
>
> Both branches contain the above commit, but with different commit IDs,
> and Laurent's "drm: rcar-du: Skip LVDS1 output on Gen3 when using
> dual-link LVDS mode" builds on top of that.
JFYI, I found a third copy in Laurent's drm/du/next branch.
> Nothing I can't handle, though.
Idem ditto.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
