From: Ingo Molnar <mingo@elte•hu>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Jens Axboe <jens.axboe@oracle•com>, linux-next@vger•kernel.org
Subject: Re: linux-next: manual merge of the generic-ipi tree
Date: Wed, 16 Jul 2008 13:44:57 +0200 [thread overview]
Message-ID: <20080716114457.GA5615@elte.hu> (raw)
In-Reply-To: <20080716205639.4655ccca.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi Ingo,
>
> On Wed, 16 Jul 2008 12:40:12 +0200 Ingo Molnar <mingo@elte•hu> wrote:
> >
> > hm, so them being stale over the merge window is a problem for you,
> > even thought the sha1's didnt change? Ok - i'll do a full
> > integration run right away to update them all to linus-very-latest.
> > There's been quite a number of nontrivial interactions.
>
> Its not to bad except where what gets merged to Linus is not exactly
> what is in linux-next. This can be because they are sent to Linus as
> patches, or the just the merge commits are are different.
Hm. Sometimes i collapse merge fixlets into the conflict resolution
commit to reduce the bisection breakage window. If the difference is
material (and for the worse ;-) then please let us know about it.
> However, once a tree is merged to Linus, just resetting resetting it
> to be (a subset of) his tree (for some a fast forward for others not)
> makes sense anyway. (And makes my life easier :-))
>
> So thanks for that.
Instead of a reset i did an integration run. That automatically gets rid
of everything that Linus has merged - plus it adds whatever got merged
meanwhile in various topic branches. (because life doesnt stop :)
For many topics that means auto-topic-next == linus, but it's inherently
safer than an explicit reset, because it cannot result in the loss of
commits :-)
Ingo
next prev parent reply other threads:[~2008-07-16 11:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 9:45 linux-next: manual merge of the generic-ipi tree Stephen Rothwell
2008-07-16 10:19 ` Ingo Molnar
2008-07-16 10:25 ` Stephen Rothwell
2008-07-16 10:40 ` Ingo Molnar
2008-07-16 10:56 ` Stephen Rothwell
2008-07-16 11:44 ` Ingo Molnar [this message]
2008-07-16 11:14 ` Ingo Molnar
2008-07-16 13:14 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-07-07 16:46 Stephen Rothwell
2008-07-03 6:56 Stephen Rothwell
2008-07-03 6:44 Stephen Rothwell
2008-07-03 6:40 Stephen Rothwell
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=20080716114457.GA5615@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=jens.axboe@oracle$(echo .)com \
--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