public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Andi Kleen <andi@firstfloor.org>
To: Ray Lee <ray-lk@madrabbit.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Jesse Barnes <jbarnes@virtuousgeek.org>,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	torvalds@linuxfoundation.org, linux-kernel@vger.kernel.org,
	linux-acpi@vger.kernel.org
Subject: Re: Please pull ACPI updates
Date: Thu, 17 Jul 2008 21:49:31 +0200	[thread overview]
Message-ID: <487FA24B.9060803@firstfloor.org> (raw)
In-Reply-To: <2c0942db0807171211s39e2653fwdc50f92d9c3020d2@mail.gmail.com>


> It matters to us end-testers when we do a git bisect. If you leave the
> history intact 

The whole point of the exercise of cleaning up/rewriting the history is to make
the tree as bisectable as possible.

Otherwise e.g. if I submitted patch + fixup + fixup + revert + fixup etc.
everyone doing a bisect would go crazy or rather hit many points
with various subtle breakages.

and let the merging happen at Linus' end (or, at least
> at merge time), then there is a point in history of your tree that
> someone (or git bisect) can check out and try, validating the patch,
> and therefore fingering a failed merge.

Why would you care about the merge and not about the individual patches?
Note that these quilt merges don't have conflicts.

> It's the difference between having tested patches and an untested
> merge, or untested new patches

The patches are as tested individually as they were before. I don't see
how you can call something that was in linux-next for some time and also
in my test tree "untested". The completely merged tree is not tested
well [1] in both cases (unless after some time of course) as far as I can see,
no difference.

[1] I do some basic testing as in building and test booting on a few
machines on each merge, so calling it completely untested is not
true.

> and an untested merge. 

So when I do a rebase versus Linus doing a merge (end result
the same code base) how is that more untested?

Your point is
> the end result is untested either way. The other way to look at it is
> *how much* untested history ends up in the tree. In Linus' version,
> just the point from the merge onward is untested. In your version,
> everything is new.

Sorry I still don't see the difference. AFAIK the only difference
is that I do the merge vs Linus doing it and that it looks slightly
different in the history, but apart from that (as in what
actually ends up in the source tree) it's all the same.

-Andi



  reply	other threads:[~2008-07-17 19:49 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-16 21:45 Please pull ACPI updates Andi Kleen
2008-07-16 22:11 ` Rafael J. Wysocki
2008-07-16 23:33   ` Jesse Barnes
2008-07-16 23:45     ` Linus Torvalds
2008-07-16 23:51       ` Jesse Barnes
2008-07-17  0:32         ` Linus Torvalds
2008-07-17  0:53           ` Linus Torvalds
2008-07-17  2:26             ` Jesse Barnes
2008-07-17  2:56               ` Linus Torvalds
2008-07-17  6:45           ` Andi Kleen
2008-07-17 15:06             ` Linus Torvalds
2008-07-17  6:40       ` Andi Kleen
2008-07-17 15:03         ` Linus Torvalds
2008-07-17 18:49           ` Len Brown
2008-07-17 19:12             ` Harvey Harrison
2008-07-17 19:50               ` Andi Kleen
2008-07-17 19:12             ` Linus Torvalds
2008-07-17 19:16               ` Linus Torvalds
2008-07-17 21:15             ` J. Bruce Fields
2008-07-17 23:11           ` [PATCH] Revert duplicate "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled" commit (was: Please pull ACPI updates) Thomas Gleixner
2008-07-17 23:25             ` [PATCH] Revert duplicate "dock: bay: Don't call acpi_walk_namespace() when ACPI is disabled" commit Andi Kleen
2008-07-18  0:07             ` [PATCH] Revert duplicate "ACPI: don't walk tables if ACPI was disabled" commit (was: Please pull ACPI updates) Thomas Gleixner
2008-07-17  6:47     ` Please pull ACPI updates Andi Kleen
2008-07-17 15:18       ` Linus Torvalds
2008-07-17 15:47         ` Linus Torvalds
2008-07-17 16:02           ` Linus Torvalds
2008-07-17 16:23           ` Andi Kleen
2008-07-17 19:11             ` Ray Lee
2008-07-17 19:49               ` Andi Kleen [this message]
2008-07-17 20:01                 ` Linus Torvalds
2008-07-17 20:14                   ` Andi Kleen
2008-07-17 20:16                   ` Linus Torvalds
2008-07-17 20:28                     ` Linus Torvalds
2008-07-18 13:25                       ` Olivier Galibert
2008-07-18 15:57                         ` Ray Lee
2008-07-17 20:34                     ` Andi Kleen
2008-07-17 20:11                 ` Ray Lee
2008-07-17 20:29                   ` Andi Kleen
2008-07-18  6:39                     ` david
  -- strict thread matches above, loose matches on Subject: below --
2008-07-24 20:36 Andi Kleen

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=487FA24B.9060803@firstfloor.org \
    --to=andi@firstfloor.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ray-lk@madrabbit.org \
    --cc=rjw@sisk.pl \
    --cc=torvalds@linux-foundation.org \
    --cc=torvalds@linuxfoundation.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