Hi Laurent, On Sat, Dec 5, 2015 at 11:54 PM, Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx> wrote: > On Saturday 05 December 2015 11:57:49 Geert Uytterhoeven wrote: >> As http://git.linuxtv.org/pinchartl/media.git/tag/?id=vsp1-kms-20151112 is >> getting old, and has lots of conflicts with recent -next, do you plan to >> publish this in a branch, and a separate branch for integration, to ease >> integration in renesas-drivers? >> >> Alternatively, I can just import the series you posted, but having the >> broken-out integration part would be nice. > > The issue I'm facing is that there's more than just two series. Beside the > base VSP patches from this series, I have a series of DRM patches that depend > on this one, a series of V4L2 core patches, another series of VSP patches that > I still need to finish and a bunch of integration patches. As some of these > have dependencies on H3 CCF support that hasn't landed in Simon's tree yet, I > have merged your topic/cpg-mssr-v6 and topic/r8a7795-drivers-sh-v1 branches > into my tree for development. > > I could keep all series in separate branches and merge the two topic branches > last, but that's not very handy during development when I have to continuously > rebase my patches. Is there a way I could handle this that would make your > life easier while not making mine more difficult ? I feel your pain... For development, committing to a single branch and rebasing interactively is also my workflow. But after a few 100 commits, rebasing takes a long time. And you can't publish that tree. I started moving "finished" stuff to separate topic branches (this is the stuff published/imported into renesas-drivers topic branches, or kept in private branches for the parts I don't want to publish it yet), and merging them early on. Actual development is still done on top with frequent rebasing. The problem starts when updating that. Instead of a simple rebase -i, it now involves: - Duplicating the old topic branch, version number increased, - Interactively rebasing the new topic branch, including/squashing commits from recent development, - Merging in the new topic branch "early on", and rebasing all other private development on top of that. For "big" changes that's OK. For adding a bunch of Acked-by's it's a lot of work. > In the meantime I've pushed vsp1-kms-20151206 to > git://linuxtv.org/pinchartl/media.git. Hadn't thanked you yet for that: 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 -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
