Hi Laurent,
On Mon, Jun 19, 2017 at 10:15 AM, Laurent Pinchart
<laurent.pinchart@xxxxxxxxxxxxxxxx> wrote:
> On Friday 16 Jun 2017 10:03:57 Geert Uytterhoeven wrote:
>> On Thu, Jun 15, 2017 at 8:54 PM, Laurent Pinchart wrote:
>> > The following changes implement display support for the R-Car H3 ES2.0.
>> > They have been split in three distinct branches:
>>
>> Thanks for your branches!
>>
>> > - tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top
>> > of topic/r8a7795es2-integration
>>
>> When merging this into next-20170616, there are lots of conflicts.
>> Most are due to your tag being based on a one-month old version of
>> renesas-devel.
>>
>> As the relevant DT changes in topic/r8a7795es2-integration have been applied
>> to renesas-devel, you could rebase on top of the latter.
>
> Do you mean renesas-devel-20170616-v4.12-rc5 ? I don't want to pull the whole
For example.
> renesas-drivers tree as a base for my development branches, I'd prefer keeping
s/drivers/devel/?
> the out-of-mainline dependencies as small as possible.
For submission upstream, your DT patches must apply to renesas-devel, so you
will have to do the rebase anyway. Doing so before sending a pull request for
renesas-drivers saves me from duplicating that work.
If you don't want all of renesas-devel, you can rebase on top of Simon's tag
arm64-dt-for-v4.13, or arm64-dt-for-v4.14, which has just appeared.
Thanks!
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
