which branch of kvm.git should I do regular testing against?

which branch of kvm.git should I do regular testing against?

[Ren, Yongjie]

Hi Avi,
Our team spare some effort in regular nightly testing against KVM upstream.
We're using master branch now and all the test reports I sent out are based on master branch.
Which branch of kvm.git should we do regular testing against?
Your suggestion?

I know next branch contains latest KVM patches. 
But I found some recent KVM patches in master branch never existed in next branch.
And, the next branch is based on linux3.4-rc3, while master branch is based on linux3.4-rc7.
Another question is whether the patches in next branch will be finally merged into master branch?


Best Regards,
     Yongjie (Jay)

Re: which branch of kvm.git should I do regular testing against?

[Avi Kivity]

On 05/24/2012 12:24 PM, Ren, Yongjie wrote:
> Hi Avi,
> Our team spare some effort in regular nightly testing against KVM upstream.
> We're using master branch now and all the test reports I sent out are based on master branch.
> Which branch of kvm.git should we do regular testing against?
> Your suggestion?

kvm.git next.  In theory kvm.git auto-next is even better, but we
sometimes forget to update it.

> 
> I know next branch contains latest KVM patches. 
> But I found some recent KVM patches in master branch never existed in next branch.
> And, the next branch is based on linux3.4-rc3, while master branch is based on linux3.4-rc7.

'master' contains fixes, 'next' contains updates queued for the merge
window. 'auto-next' should contain both, plus the latest upstream.


> Another question is whether the patches in next branch will be finally merged into master branch?
> 

During the merge window.


-- 
error compiling committee.c: too many arguments to function

RE: which branch of kvm.git should I do regular testing against?

[Ren, Yongjie]

> -----Original Message-----
> From: Avi Kivity [mailto:avi@redhat.com]
> Sent: Thursday, May 24, 2012 5:29 PM
> To: Ren, Yongjie
> Cc: KVM; Marcelo Tosatti
> Subject: Re: which branch of kvm.git should I do regular testing against?
> 
> On 05/24/2012 12:24 PM, Ren, Yongjie wrote:
> > Hi Avi,
> > Our team spare some effort in regular nightly testing against KVM
> upstream.
> > We're using master branch now and all the test reports I sent out are
> based on master branch.
> > Which branch of kvm.git should we do regular testing against?
> > Your suggestion?
> 
> kvm.git next.  In theory kvm.git auto-next is even better, but we
> sometimes forget to update it.
> 
Thanks. Get it. I'll use kvm.git next.
As for qemu-kvm.git, master or next branch?

> >
> > I know next branch contains latest KVM patches.
> > But I found some recent KVM patches in master branch never existed in
> next branch.
> > And, the next branch is based on linux3.4-rc3, while master branch is
> based on linux3.4-rc7.
> 
> 'master' contains fixes, 'next' contains updates queued for the merge
> window. 'auto-next' should contain both, plus the latest upstream.
> 
Get it.
> 
> > Another question is whether the patches in next branch will be finally
> merged into master branch?
> >
> 
> During the merge window.
> 
> 
> --
> error compiling committee.c: too many arguments to function

Re: which branch of kvm.git should I do regular testing against?

[Avi Kivity]

On 05/24/2012 12:33 PM, Ren, Yongjie wrote:
>> 
>> On 05/24/2012 12:24 PM, Ren, Yongjie wrote:
>> > Hi Avi,
>> > Our team spare some effort in regular nightly testing against KVM
>> upstream.
>> > We're using master branch now and all the test reports I sent out are
>> based on master branch.
>> > Which branch of kvm.git should we do regular testing against?
>> > Your suggestion?
>> 
>> kvm.git next.  In theory kvm.git auto-next is even better, but we
>> sometimes forget to update it.
>> 
> Thanks. Get it. I'll use kvm.git next.
> As for qemu-kvm.git, master or next branch?

Unlike kvm.git, these should be pretty close.  'next' is untested,
'master' is tested, they are synced after testing.  I suggest 'master'.

-- 
error compiling committee.c: too many arguments to function

RE: which branch of kvm.git should I do regular testing against?

[Ren, Yongjie]

> -----Original Message-----
> From: Avi Kivity [mailto:avi@redhat.com]
> Sent: Thursday, May 24, 2012 5:46 PM
> To: Ren, Yongjie
> Cc: KVM; Marcelo Tosatti
> Subject: Re: which branch of kvm.git should I do regular testing against?
> 
> On 05/24/2012 12:33 PM, Ren, Yongjie wrote:
> >>
> >> On 05/24/2012 12:24 PM, Ren, Yongjie wrote:
> >> > Hi Avi,
> >> > Our team spare some effort in regular nightly testing against KVM
> >> upstream.
> >> > We're using master branch now and all the test reports I sent out are
> >> based on master branch.
> >> > Which branch of kvm.git should we do regular testing against?
> >> > Your suggestion?
> >>
> >> kvm.git next.  In theory kvm.git auto-next is even better, but we
> >> sometimes forget to update it.
> >>
> > Thanks. Get it. I'll use kvm.git next.
> > As for qemu-kvm.git, master or next branch?
> 
> Unlike kvm.git, these should be pretty close.  'next' is untested,
> 'master' is tested, they are synced after testing.  I suggest 'master'.
> 
Get it. Thanks.