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
Subject: Re: linux-next: manual merge of the ftrace tree
Date: Tue, 14 Oct 2008 08:26:52 +0200 [thread overview]
Message-ID: <20081014062652.GA24978@elte.hu> (raw)
In-Reply-To: <20081014160311.c5f0ccdf.sfr@canb.auug.org.au>
* Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the ftrace tree got a conflict in
> arch/x86/kernel/traps.c between various commits now in Linus' tree and
> various commits from the ftrace tree.
>
> The result is a bit of a mess and really needs to be resolved by
> someone who understands the changes involved. So I have dropped the
> ftrace tree for today.
yes - it's quite complex to merge it in its current state, i'll resolve
that and reintegrate.
Ingo
next prev parent reply other threads:[~2008-10-14 6:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 5:03 linux-next: manual merge of the ftrace tree Stephen Rothwell
2008-10-14 6:26 ` Ingo Molnar [this message]
2008-10-14 7:00 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-12-11 0:41 Stephen Rothwell
2008-12-11 1:23 ` Frédéric Weisbecker
2008-12-11 2:07 ` Stephen Rothwell
2008-12-12 9:23 ` Ingo Molnar
2008-12-01 0:37 Stephen Rothwell
2008-12-01 7:40 ` Ingo Molnar
2008-11-24 0:11 Stephen Rothwell
2008-11-24 2:11 ` Ingo Molnar
2008-11-24 2:23 ` Stephen Rothwell
2008-08-21 3:09 Stephen Rothwell
2008-08-21 3:33 ` Greg KH
2008-08-21 4:03 ` Mathieu Desnoyers
2008-08-15 1:54 Stephen Rothwell
2008-08-25 2:01 ` Stephen Rothwell
2008-08-25 9:16 ` Ingo Molnar
2008-08-25 11:56 ` 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=20081014062652.GA24978@elte.hu \
--to=mingo@elte$(echo .)hu \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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