Re: [Xen-devel] [URGENT RFC] Branching and reopening -unstable

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 11.08.15 at 12:44, <wei.liu2@xxxxxxxxxx> wrote:
> As for bug fixes, here are two options.
> 
> Option 1: bug fixes go into -unstable, backport / cherry-pick bug
> fixes back to 4.6. This seems to leave the tree in half frozen status
> because we need to reject refactoring patches in case they cause
> backporting failure.
> 
> Option 2: bug fixes go into 4.6, merge them to -unstable. If merge has
> conflict and maintainers can't deal with that, the authors of those
> changes in -unstable which cause conflict is responsible for fixing up
> the conflict.

I don't see why even on #2 bug fixes shouldn't go into -unstable
first - as usual backports should carry a reference to the master
commit.

And personally I'd favor the revised #2 over #1 or unrevised #2.

Jan


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel