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, Steven Rostedt <srostedt@redhat.com>
Subject: Re: linux-next: manual merge of the ftrace tree
Date: Mon, 24 Nov 2008 03:11:34 +0100 [thread overview]
Message-ID: <20081124021134.GA23669@elte.hu> (raw)
In-Reply-To: <20081124111112.fa876dce.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
> kernel/trace/ftrace.c between commits
> 820432783190b4096499e38a4a4d7095c511913d ("ftrace: make filtered
> functions effective on setting") and
> 32464779a1b8c15e9aa9aa0306b2f735080df9d8 ("ftrace: fix dyn ftrace filter
> selection") from Linus' tree and commit ftrace_startup ("ftrace: add
> quick function trace stop") from the ftrace tree.
>
> I fixed it up (see below - which may not be correct) but it needs to be
> fixed in the ftrace tree.
hm, latest tip/auto-ftrace-next has no merge commit with -git. But i
reintegrated it about an hour before you sent this mail - maybe you've
got the old branch still?
Ingo
next prev parent reply other threads:[~2008-11-24 2:11 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-24 0:11 linux-next: manual merge of the ftrace tree Stephen Rothwell
2008-11-24 2:11 ` Ingo Molnar [this message]
2008-11-24 2:23 ` 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-10-14 5:03 Stephen Rothwell
2008-10-14 6:26 ` Ingo Molnar
2008-10-14 7:00 ` 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=20081124021134.GA23669@elte.hu \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=srostedt@redhat.com \
--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).