iio/testing git tree status

iio/testing git tree status

[Alison Schofield]

Hi Jonathan,

I want to submit a patch (new feature) to the iio/testing branch, but a fix
that is a dependency is only in iio/fixes-togreg.  

How do these get sync'd? How should I proceed?  I can wait for the sync.

Thanks,
alisons

Re: iio/testing git tree status

[Jonathan Cameron]

On 23/08/16 18:43, Alison Schofield wrote:
> Hi Jonathan,
> 
> I want to submit a patch (new feature) to the iio/testing branch, but a fix
> that is a dependency is only in iio/fixes-togreg.  
> 
> How do these get sync'd? How should I proceed?  I can wait for the sync.
It takes a little while, but as follows:

* I send Greg KH a pull request for fixes-togreg
* He pulls it and sometime later sends Linus a pull request including those fixes.
* Linus pulls it.
* Greg at some point after that does a merge with mainline of the staging-next tree.
* After a pull request for togreg has been pulled, I fast forward my togreg branch
* At that point it will be in the togreg branch which is what testing is a temporary
copy of...

Can take a few weeks.  Might not now happen before the next merge window. Everything
will unroll at that point anyway though so that doesn't really effect timing.

Feel free to post your patch with the dependency listed in the description.
Then poke me when I inevitably forget all about it.

Jonathan
> 
> Thanks,
> alisons
>