Hi Josh, On Mon, 22 Sep 2014 15:51:56 -0700 [email protected] wrote: > > On Tue, Sep 23, 2014 at 08:34:42AM +1000, Stephen Rothwell wrote: > > > > I do not want code for release N in linux-next until after (N-1)-rc1 > > has been released. > > So, rather than moving tiny/next-next to tiny/next as soon as tiny/next > gets merged during the merge window, wait until the end of the merge > window (and the release of -rc1) to do so? That makes sense, to avoid > causing confusion and unnecessary conflicts during the merge window.
Yes, that is exactly my motivation. > The code in tiny/next right now is based on 3.17-rc1, and is intended > for 3.18. I'll send a pull request for 3.18 as soon as the 3.18 merge > window opens, and any patches I receive after that point will go into > tiny/next-next. I'll wait to move tiny/next-next to tiny/next until > 3.18-rc1 is released. Of course, bug fixes should be merged as soon as sensible/possible in any case. Some people run a second branch for bug fixes which they merge into their -next branch (if the fixes warrant it) after Linus' merges it. But that may be overkill. -- Cheers, Stephen Rothwell [email protected]
signature.asc
Description: PGP signature
