Re: [yocto] Master or master-next?

2016-03-16 Thread Burton, Ross 
On 15 March 2016 at 22:56, Chris Tapp  wrote:

> Should I use master or master-next to track 2.1 release progress?
>

master-next is a guideline of what's due to be merged shortly but patches
will be re-ordered, rebased, partially merged or dropped from it, so only
do that if you're sure.  And double-check that master-next is in fact a
direct child of master (or whatever the correct terminology for git is).
At the moment, master is newer than master-next and rebasing -next onto
master shows that it contains just two patches that are known to be broken
right now.

Ross
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] Master or master-next?

2016-03-15 Thread Khem Raj 
Master
On Mar 15, 2016 3:57 PM, "Chris Tapp"  wrote:

> Should I use master or master-next to track 2.1 release progress?
>
> --
>
> Chris Tapp
> opensou...@keylevel.com
> www.keylevel.com
>
> 
> You can tell you're getting older when your car insurance gets real cheap!
>
>
> --
> ___
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
>
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] Master or master-next?

2016-03-15 Thread Chris Tapp 

> On 15 Mar 2016, at 23:05, Christopher Larson  wrote:
> 
> On Tue, Mar 15, 2016 at 3:56 PM Chris Tapp  > wrote:
> Should I use master or master-next to track 2.1 release progress?
> 
> master-next is rebased. I wouldn't recommend using it unless you need to test 
> something specific which is on that branch and isn't yet on master, otherwise 
> I'd wait for changes to hit master. master is volatile enough at times ;)

Thanks. Just working through an “introspection” message as we speak ;-)

Just seeing where I’m at so I can jump when 2.1 is released :-)

--

Chris Tapp
opensou...@keylevel.com
www.keylevel.com


You can tell you're getting older when your car insurance gets real cheap!



signature.asc
Description: Message signed with OpenPGP using GPGMail
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Re: [yocto] Master or master-next?

2016-03-15 Thread Christopher Larson 
On Tue, Mar 15, 2016 at 3:56 PM Chris Tapp  wrote:

> Should I use master or master-next to track 2.1 release progress?
>

master-next is rebased. I wouldn't recommend using it unless you need to
test something specific which is on that branch and isn't yet on master,
otherwise I'd wait for changes to hit master. master is volatile enough at
times ;)
-- 
___
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto