[GIT PULL FOR v3.12] R-Car DU DRM support for R8A7790 SoC

Dave Airlie airlied at gmail.com
Fri Aug 9 13:45:05 PDT 2013


On Thu, Aug 8, 2013 at 11:39 AM, Simon Horman <horms at verge.net.au> wrote:
> On Thu, Aug 08, 2013 at 03:34:17AM +0200, Laurent Pinchart wrote:
>> Hi Dave,
>>
>> (CC'ing Simon Horman, the shmobile tree maintainer)
>>
>> On Thursday 08 August 2013 10:57:33 Dave Airlie wrote:
>> > On Thu, Aug 8, 2013 at 10:43 AM, Laurent Pinchart wrote:
>> > > Hi Dave,
>> > >
>> > > I've got a couple of arch/arm/ patches that depend on this series and that
>> > > I would like to get merged in v3.12. They should go upstream through the
>> > > arm-soc tree. Would you be able to provide a stable branch with this
>> > > patch set based on one of the 3.11-rcX tags ? Ideally that branch should
>> > > have as little patches as possible other than this set.
>> >
>> > Yeah that shouldn't be a problem, though is there any interface changes or
>> > things with this wrt drm-next?
>> >
>> > i.e. will this tree build on v3.11-rcX and drm-next?
>>
>> They depend on a fix that went in between -rc1 and -rc2. You can base the
>> branch on any -rc >= 2.
>
> An rc2 or rc3 base would be ideal for me, but any rc would be fine.

So the problem with making a stable branch is we have conflicts in
other places that have already been solved in drm-next,

is there any problem with using Laurent's tree directly as the stable point?

Dave.


More information about the dri-devel mailing list