Em Fri, 3 Feb 2017 11:01:17 +1100
Stephen Rothwell <s...@canb.auug.org.au> escreveu:
> Hi Mauro,
>
> On Thu, 2 Feb 2017 21:24:40 -0200 Mauro Carvalho Chehab
> <mche...@osg.samsung.com> wrote:
> >
> > I actually push the patches on a different tree:
> > git://linuxtv.org/media_tree.git
> >
> > At the branches "master" and "fixes", where
> >
> > master - for rolling develoment patches
> > fixes - for bug fixes against current -rc release
>
> So maybe I should fetch those 2 branches separately and save you the
> bother of merging them yourself? There will be occasional conflicts,
> but I get those with others trees as well.
Yeah, that makes sense.
>
> > My current procedure is to manually merge both branches
> > at git://linuxtv.org/mchehab/media-next.git, but this is a manual
> > work, that I use to do by the end of the days I merge patches.
> > Unfortunately, sometimes, I got side-tracked by something and
> > I forget to do such manual merge.
>
> Unless you need to do that for your own testing.
Yes, when I merge there, I usually run a batch process that takes
about 2 hours on my current build machine[1] and compile it with 57
different config/arch combinations.
[1] I'm waiting for a new machine that will hopefully reduce it.
With Kernel test robot, this usually get good results.
It would be still interesting if you could pull from it, as
sometimes I need to create topic branches (either when there's
a controversial patchset that I would be sending in separate, or
when I need to pull from some other subsystem tree to solve a
complex merge conflict).
So, if this is not a problem to you, maybe you can setup your
environment to pull (in this order) from:
git://linuxtv.org/media_tree.git fixes
git://linuxtv.org/media_tree.git master
git://linuxtv.org/mchehab/media-next.git master
Most of the time, the last pull won't get anything.
--
Thanks,
Mauro
