From: Ingo Molnar <mingo@elte.hu>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
the arch/x86 maintainers <x86@kernel.org>
Subject: Re: linux-next: Tree for June 5
Date: Fri, 6 Jun 2008 10:36:39 +0200 [thread overview]
Message-ID: <20080606083639.GD10826@elte.hu> (raw)
In-Reply-To: <20080606013058.e5d52c97.akpm@linux-foundation.org>
* Andrew Morton <akpm@linux-foundation.org> wrote:
> > Each tree is fine on its own if you go one step back from the merge.
>
> Well OK. But patches in fact _do_ go into Linux as a single linear
> stream of commits. But the whole git model ignores that reality and
> here we see the result.
it's fixable via "git-merge -n" and then doing a second git-merge, to
create only a single commit. OTOH, it's more transparent to have such
manual fixups in a followup commit.
Ingo
next prev parent reply other threads:[~2008-06-06 8:37 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 7:52 linux-next: Tree for June 5 Stephen Rothwell
2008-06-06 2:56 ` Andrew Morton
2008-06-06 3:46 ` Andrew Morton
2008-06-06 7:17 ` Ingo Molnar
2008-06-06 7:25 ` Ingo Molnar
2008-06-06 7:33 ` Andrew Morton
2008-06-06 7:41 ` Ingo Molnar
2008-06-06 7:47 ` Andrew Morton
2008-06-06 7:53 ` Stephen Rothwell
2008-06-06 8:01 ` Andrew Morton
2008-06-06 8:22 ` Stephen Rothwell
2008-06-06 8:30 ` Andrew Morton
2008-06-06 8:36 ` Ingo Molnar [this message]
2008-06-06 11:50 ` Paul Mackerras
2008-06-06 8:27 ` Ingo Molnar
2008-06-06 8:23 ` Ingo Molnar
2008-06-06 8:28 ` Stephen Rothwell
2008-06-06 8:33 ` Ingo Molnar
2008-06-06 8:38 ` Andrew Morton
2008-06-06 8:49 ` Ingo Molnar
2008-06-06 9:01 ` Andrew Morton
2008-06-06 10:47 ` Ingo Molnar
2008-06-06 16:37 ` Ingo Molnar
2008-06-06 7:29 ` Andrew Morton
2008-06-06 9:48 ` Andrew Morton
2008-06-06 9:54 ` Andrew Morton
2008-06-06 10:10 ` Ingo Molnar
2008-06-06 10:54 ` Andrew Morton
2008-06-06 11:21 ` Vegard Nossum
2008-06-06 11:57 ` Ingo Molnar
2008-06-06 12:33 ` Vegard Nossum
2008-06-06 13:33 ` Mike Travis
2008-06-06 13:50 ` Vegard Nossum
2008-06-06 14:07 ` Vegard Nossum
2008-06-06 14:20 ` Mike Travis
2008-06-06 14:36 ` Vegard Nossum
2008-06-06 14:41 ` Mike Travis
2008-06-06 14:51 ` Mike Travis
2008-06-06 14:54 ` Mike Travis
2008-06-06 14:57 ` Ingo Molnar
2008-06-06 15:01 ` Ingo Molnar
2008-06-06 15:13 ` Vegard Nossum
2008-06-06 15:23 ` Ingo Molnar
2008-06-06 15:52 ` Mike Travis
2008-06-18 8:26 ` Ingo Molnar
2008-06-06 15:04 ` Mike Travis
2008-06-06 15:20 ` Mike Travis
2008-06-06 15:33 ` Ingo Molnar
2008-06-06 15:13 ` Ingo Molnar
2008-06-06 14:13 ` Mike Travis
2008-06-06 13:28 ` Mike Travis
2008-06-06 17:15 ` Ingo Molnar
2008-06-06 7:33 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-06-05 6:41 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=20080606083639.GD10826@elte.hu \
--to=mingo@elte.hu \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=x86@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.