Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support, v2

[Geert Uytterhoeven]

Hi Laurent,

On Mon, Jun 26, 2017 at 8:58 PM, Laurent Pinchart
 wrote:
> The following changes implement display support for the R-Car H3 ES2.0. They
> have been split in two distinct branches:

> - tags/drm-h3-es2-vsp-du-20170626 contains the VSP changes and is based on top
> of the latest DRM -next branch
>
> The following changes since commit 047b8e21e3bfa9faa4ed9a0c337fe0c687710251:
>
>   Merge tag 'drm-misc-next-2017-06-19_0' of
> git://anongit.freedesktop.org/git/drm-misc into drm-next (2017-06-21 08:57:34
> +1000)
>
> are available in the git repository at:
>
>   git://linuxtv.org/pinchartl/media.git tags/drm-h3-es2-vsp-du-20170626
>
> for you to fetch changes up to 8d09cbf4a12a4c79619c0edf23f9e219e29f5749:
>
>   drm: rcar-du: Configure DPAD0 routing through last group on Gen3 (2017-06-26
> 19:08:54 +0300)

Dropped, as it looks like a newer version has been merged upstream.

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

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

Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support

[Geert Uytterhoeven]

Hi Laurent,

On Mon, Jun 19, 2017 at 10:15 AM, Laurent Pinchart
 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 -- ge...@linux-m68k.org

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

Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support

[Laurent Pinchart]

Hi Geert,

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 
renesas-drivers tree as a base for my development branches, I'd prefer keeping 
the out-of-mainline dependencies as small as possible.

> > - tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU
> > and is based on top of sh-pfc-for-v4.13-tag1
> 
> Merges cleanly into next-20170616.
> 
> > - tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on
> > top of v4.12-rc1
> 
> When merging this into next-20170616, there are two conflicts, in
> drivers/media/platform/vsp1/vsp1_dl.c and include/media/vsp1.h.

-- 
Regards,

Laurent Pinchart

Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support

[Geert Uytterhoeven]

Hi Laurent,

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.

> - tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU and
> is based on top of sh-pfc-for-v4.13-tag1

Merges cleanly into next-20170616.

> - tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on top of
> v4.12-rc1

When merging this into next-20170616, there are two conflicts, in
drivers/media/platform/vsp1/vsp1_dl.c and include/media/vsp1.h.

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

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