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, Helge Deller <deller@gmx•de>,
Kyle McMartin <kyle@mcmartin•ca>,
linux-parisc@vger•kernel.org,
Uwe Kleine-Koenig <u.kleine-koenig@pengutronix•de>,
Steven Rostedt <srostedt@redhat•com>
Subject: linux-next: manual merge of the tracing tree with the parisc tree
Date: Wed, 1 Apr 2009 11:37:40 +1100 [thread overview]
Message-ID: <20090401113740.7f425e02.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
Hi all,
Today's linux-next merge of the tracing tree got a conflict in
arch/parisc/include/asm/ftrace.h between commit
d75f054a2cf0614ff63d534ff21ca8eaab41e713 ("parisc: add ftrace (function
and graph tracer) functionality") from the parisc tree and commit
c79a61f55773d2519fd0525bf58385f7d20752d3 ("tracing: make CALLER_ADDRx
overwriteable") from the tracing tree.
The former adds a non-trivial version of the file, so I used that.
--
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:[~2009-04-01 0:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-01 0:37 Stephen Rothwell [this message]
2009-04-01 6:54 ` linux-next: manual merge of the tracing tree with the parisc tree Uwe Kleine-König
2009-04-01 11:05 ` Ingo Molnar
2009-04-01 11:10 ` Uwe Kleine-König
2009-04-01 11:19 ` Ingo Molnar
2009-04-01 17:50 ` Kyle McMartin
2009-04-02 11:32 ` Stephen Rothwell
2009-04-02 13:54 ` James Bottomley
2009-04-02 15:22 ` Kyle McMartin
2009-04-03 14:15 ` 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=20090401113740.7f425e02.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=deller@gmx$(echo .)de \
--cc=hpa@zytor$(echo .)com \
--cc=kyle@mcmartin$(echo .)ca \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=srostedt@redhat$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=u.kleine-koenig@pengutronix$(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