Hi Mauro, On Saturday, 5 May 2018 18:05:13 EEST Mauro Carvalho Chehab wrote: > Em Sat, 05 May 2018 17:06:50 +0300 Laurent Pinchart escreveu: > > On Thursday, 3 May 2018 16:45:36 EEST Daniel Vetter wrote: > >> On Thu, May 3, 2018 at 2:06 PM, Laurent Pinchart wrote: > >>> Hi Dave, > >>> > >>> Ping ? > >> > >> Not aware of any crc core work going on in drm, so has my ack. > > > > Thank you. > > > >> Worst case we do a topic branch or something like that (since I guess > >> you'll do a pull request anyway on the v4l side). > > > > That would unfortunately not be possible, as Mauro cherry-picks patches > > instead of merging pull requests. In rare cases I can ask for a > > pull-request to be merged as-is, but it's too late in this case as the > > previous pull request that this series is based on has been > > cherry-picked, not merged. > > I probably missed something, but I fail to see what's the problem. > > If DRM needs a patch that was already merged on our tree, I can gladly > create a stable branch/tag for it - well, media master branch is stable, > but I can add a tag there just after the patch DRM needs, in order > to avoid them to merge from us at some random point. > > If otherwise we need a patch applied at DRM, they can do the same: > create a branch/tag, and I can pull from it. Well, my assumption is that Dave would rather not pull the whole linux-media tree in the DRM tree. That's easily prevented when handling pull requests through a merge instead of a cherry-pick operation, in that case I can just base a patch series on top of -rc1 and send a pull request to both of you. The linux-media and DRM tree will merge cleanly in Linus' tree as they will both contain the same branch. -- Regards, Laurent Pinchart
