linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-next@vger.kernel.org, Peter Zijlstra <peterz@infradead.org>,
	Kumar Gala <galak@kernel.crashing.org>
Subject: Re: linux-next: manual merge of the sched tree
Date: Wed, 19 Nov 2008 09:45:53 +0100	[thread overview]
Message-ID: <20081119084553.GE1078@elte.hu> (raw)
In-Reply-To: <20081119122746.29db6c3a.sfr@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the sched tree got a conflict in 
> kernel/Makefile between commit 
> 65ecc14a30ad21bed9aabdfd6a2ae1a1aaaa6a00 ("Remove -mno-spe flags as 
> they dont belong") from Linus' tree and commit 
> 8bb8c4386d08f2cc5d871d22f220d35032213f84 ("sched, ftrace: trace 
> sched.c") from the sched tree.
> 
> I fixed it up (see below) and can carry it for a short while.

i did a similar conflict resolution yesterday. I have pushed out a new 
tip/auto-sched-next branch - you should not see this conflict in the 
future.

Thanks,

	Ingo

  reply	other threads:[~2008-11-19  8:46 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-19  1:27 linux-next: manual merge of the sched tree Stephen Rothwell
2008-11-19  8:45 ` Ingo Molnar [this message]
2008-11-19  9:29   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-12-22  1:05 Stephen Rothwell
2008-12-22  1:46 ` Paul E. McKenney
2008-12-22  6:35 ` Ingo Molnar
2008-12-30 23:45   ` Stephen Rothwell
2008-07-22  1:58 Stephen Rothwell
2008-07-22  1:54 Stephen Rothwell
2008-07-22  8:28 ` Stephen Rothwell
2008-07-22  9:13   ` Ingo Molnar
2008-07-22 11:07     ` Stephen Rothwell
     [not found] <20080711112146.f7f98434.sfr@canb.auug.org.au>
2008-07-11  8:43 ` Ingo Molnar
     [not found] <20080707142114.7985a9dd.sfr@canb.auug.org.au>
2008-07-07  6:02 ` Ingo Molnar
2008-07-07  6:16   ` Ingo Molnar
2008-07-07  6:41     ` Stephen Rothwell
2008-07-07  7:04       ` Ingo Molnar
2008-07-07  6:35   ` Stephen Rothwell
     [not found] ` <20080707145027.0d83038e.sfr@canb.auug.org.au>
2008-07-07  6:10   ` Ingo Molnar
2008-07-07  6:37     ` Stephen Rothwell
2008-07-01  2:42 Stephen Rothwell
2008-07-01  5:54 ` Ingo Molnar
2008-07-01  6:00   ` Stephen Rothwell
2008-07-01  6:08     ` Ingo Molnar
2008-06-25  1:55 Stephen Rothwell
2008-06-25  9:36 ` Ingo Molnar

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=20081119084553.GE1078@elte.hu \
    --to=mingo@elte.hu \
    --cc=galak@kernel.crashing.org \
    --cc=hpa@zytor.com \
    --cc=linux-next@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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;
as well as URLs for NNTP newsgroup(s).