public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: James Cloos <cloos@jhcloos.com>
Cc: linux-kernel@vger.kernel.org
Subject: Re: [patch] CFS scheduler, -v10
Date: Mon, 7 May 2007 20:40:47 +0200	[thread overview]
Message-ID: <20070507184047.GA24430@elte.hu> (raw)
In-Reply-To: <m3abwgqy5m.fsf@lugabout.jhcloos.org>


* James Cloos <cloos@jhcloos.com> wrote:

> If instead of pulling master into the cfs branch, I rather switch to 
> the master branch and pull the cfs branch into that, it works.

ah! Could you please do a git-diff between the broken and the working 
tree, to see what got mismerged?

	Ingo

  reply	other threads:[~2007-05-07 18:40 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-05-07 16:33 [patch] CFS scheduler, -v10 Ingo Molnar
2007-05-07 18:35 ` James Cloos
2007-05-07 18:40   ` Ingo Molnar [this message]
2007-05-07 19:32     ` James Cloos
2007-05-07 18:49   ` James Cloos
2007-05-07 20:43 ` Paolo Ciarrocchi
2007-05-08  0:47 ` Fortier,Vincent [Montreal]
2007-05-08  7:51 ` Mike Galbraith
2007-05-08  8:32   ` Mike Galbraith
  -- strict thread matches above, loose matches on Subject: below --
2007-05-09 11:21 Al Boldi

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=20070507184047.GA24430@elte.hu \
    --to=mingo@elte.hu \
    --cc=cloos@jhcloos.com \
    --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