From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Subject: Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers
Date: Tue, 19 Mar 2019 12:12:37 +0200 [thread overview]
Message-ID: <20190319101237.GD4765@pendragon.ideasonboard.com> (raw)
In-Reply-To: <CAMuHMdVFR3G394exJAgXmPxndsNNeRkfQF5GQdbwFMjk2Kbrfg@mail.gmail.com>
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
next prev parent reply other threads:[~2019-03-19 10:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 20:09 [GIT PULL FOR renesas-drivers] du/for-renesas-drivers Kieran Bingham
2019-03-18 8:14 ` Geert Uytterhoeven
2019-03-19 9:04 ` Geert Uytterhoeven
2019-03-19 10:12 ` Laurent Pinchart [this message]
2019-04-30 10:43 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190319101237.GD4765@pendragon.ideasonboard.com \
--to=laurent.pinchart@ideasonboard.com \
--cc=geert@linux-m68k.org \
--cc=kieran.bingham+renesas@ideasonboard.com \
--cc=linux-renesas-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.