From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: reminder 2
Date: Thu, 13 Dec 2012 12:03:51 +0100 [thread overview]
Message-ID: <s5hip86dxig.wl%tiwai@suse.de> (raw)
In-Reply-To: <20121213213922.b4474411b2370bb8432cf9eb@canb.auug.org.au>
At Thu, 13 Dec 2012 21:39:22 +1100,
Stephen Rothwell wrote:
>
> Hi Takashi,
>
> On Thu, 13 Dec 2012 10:42:09 +0100 Takashi Iwai <tiwai@suse•de> wrote:
> >
> > At Thu, 13 Dec 2012 15:32:37 +1100,
> > Stephen Rothwell wrote:
> > >
> > > If you have a tree that is included in linux-next, please clean it up
> > > after it has been merged into your upstream (i.e. Linus' tree in most
> > > cases).
> >
> > What does "clean up" mean in this context exactly?
>
> Well, if the tree you had in linux-next is pulled directly into Linus'
> tree, then you have nothing to do (except maybe a fast forward back merge
> of Linus' tree past the point your tree was merged).
>
> If your tree in linux-next is a merge of other branches that are merged
> into Linus' tree separately, then after they are all merged upstream, you
> should reset your tree to somewhere in Linus' tree.
>
> If you rebased your tree before sending it to Linus (which you should not
> do, of course), and don't update what is in linux-next to match (which
> you should also not do :-)), then you should scold your self (:-)) and
> reset your tree to be somewhere in Linus' tree.
>
> The intent is to give you somewhere nice and clean to start collecting
> your next set of commits for the next release (or bug fixes etc) and to
> minimise the conflicts with what is left in linux-next.
OK, thanks for clarification!
Takashi
prev parent reply other threads:[~2012-12-13 11:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 4:32 linux-next: reminder 2 Stephen Rothwell
2012-12-13 9:42 ` Takashi Iwai
2012-12-13 10:39 ` Stephen Rothwell
2012-12-13 11:03 ` Takashi Iwai [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=s5hip86dxig.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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