From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>
Cc: linux-next@vger•kernel.org, Lai Jiangshan <laijs@cn•fujitsu.com>,
Steven Rostedt <rostedt@goodmis•org>
Subject: linux-next: manual merge of the ftrace tree
Date: Mon, 1 Dec 2008 11:37:42 +1100 [thread overview]
Message-ID: <20081201113742.da2d3923.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 598 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/ring_buffer.c between commit
4f5a7f40ddbae98569acbb99118a98570315579c ("ftrace: prevent recursion")
from Linus' tree and commit 182e9f5f704ed6b9175142fe8da33c9ce0c52b52
("ftrace: insert in the ftrace_preempt_disable()/enable() functions")
from the ftrace tree.
I am pretty sure that the latter supercedes the former, so I used that
version. Please fix this conflict up in the ftrace tree soon.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-12-01 0:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-01 0:37 Stephen Rothwell [this message]
2008-12-01 7:40 ` linux-next: manual merge of the ftrace tree Ingo Molnar
-- 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-11-24 0:11 Stephen Rothwell
2008-11-24 2:11 ` Ingo Molnar
2008-11-24 2:23 ` Stephen Rothwell
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=20081201113742.da2d3923.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=laijs@cn$(echo .)fujitsu.com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rostedt@goodmis$(echo .)org \
--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