Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Geert,

On Tue, Mar 19, 2019 at 10:04:02AM +0100, Geert Uytterhoeven wrote:
> On Mon, Mar 18, 2019 at 9:14 AM Geert Uytterhoeven wrote:
> > On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham 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.

It's all work in progress I'm afraid, so this doesn't surprise me. I'll
send a pull request to Dave soon, all this will be fixed.

> > Nothing I can't handle, though.
> 
> Idem ditto.

-- 
Regards,

Laurent Pinchart



[Index of Archives]     [Linux Samsung SOC]     [Linux Wireless]     [Linux Kernel]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]

  Powered by Linux