Re: Should release branches be merged back into master?


Paul Sokolovsky
 

On Wed, 05 Apr 2017 13:52:42 +0100
"Jon Medhurst (Tixy)" <tixy@linaro.org> wrote:

On Wed, 2017-04-05 at 08:07 -0400, Anas Nashif wrote:
Which fixes are you referring to?
I noticed these commits from me weren't in master:

commit 06a36923c626 ("tests: dma: Initialise callback enable flags")
commit d626dc989eb5 ("api: dma: Fix comments for struct dma_config")

And comparing the titles of all commits between v1.7.0-rc1 and v1.7.0
with the contents of the master branch, I see there are 48 that aren't
in master. Of course, some of these possibly aren't relevant, or the
fixes included in other commits. But I'm bet I'm not the only one who
didn't submit their fixes to master as well as the release.
Right, as far as I know, when a release branch is forked, it goes into
semi-frozen state: patches should go into master, and once merged,
resubmitted (couple of clicks in Gerrit) for possible release branch
inclusion, based on the maintainers' assessment.


--
Best Regards,
Paul

Linaro.org | Open source software for ARM SoCs
Follow Linaro: http://www.facebook.com/pages/Linaro
http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

Join devel@lists.zephyrproject.org to automatically receive all group messages.