From: Stephen Rothwell <sfr@canb.auug.org.au>
To: josh@joshtriplett.org
Cc: linux-kernel@vger.kernel.org
Subject: Re: Please add the tiny tree to linux-next
Date: Tue, 23 Sep 2014 09:44:03 +1000 [thread overview]
Message-ID: <20140923094403.2f5a24dd@canb.auug.org.au> (raw)
In-Reply-To: <20140922225156.GA929@cloud>
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
Hi Josh,
On Mon, 22 Sep 2014 15:51:56 -0700 josh@joshtriplett.org 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 sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
prev parent reply other threads:[~2014-09-22 23:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-22 17:53 Please add the tiny tree to linux-next Josh Triplett
2014-09-22 22:34 ` Stephen Rothwell
2014-09-22 22:51 ` josh
2014-09-22 23:44 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140923094403.2f5a24dd@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox