From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Linux-Renesas <linux-renesas-soc@vger.kernel.org>
Subject: Re: [GIT PULL FOR renesas-drivers] R-Car Gen3 HDMI output support
Date: Tue, 02 May 2017 13:06:47 +0300 [thread overview]
Message-ID: <3509082.7kXcTHXJsv@avalon> (raw)
In-Reply-To: <CAMuHMdXSRN-kb0cSvi99omSYW6JA2YgvANJaLY6ysGbZpPAU2A@mail.gmail.com>
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
next prev parent reply other threads:[~2017-05-02 10:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 0:32 [GIT PULL FOR renesas-drivers] R-Car Gen3 HDMI output support Laurent Pinchart
2017-03-06 8:12 ` Geert Uytterhoeven
2017-03-06 9:30 ` Laurent Pinchart
2017-04-18 8:54 ` Geert Uytterhoeven
2017-04-18 8:56 ` Laurent Pinchart
2017-05-02 9:24 ` Geert Uytterhoeven
2017-05-02 10:06 ` Laurent Pinchart [this message]
2017-05-02 10:10 ` 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=3509082.7kXcTHXJsv@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=geert@linux-m68k.org \
--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.