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>,
Peter Zijlstra <peterz@infradead•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Neil Horman <nhorman@tuxdriver•com>,
Jason Baron <jbaron@redhat•com>,
Frederic Weisbecker <fweisbec@gmail•com>
Subject: linux-next: manual merge of the tip tree with the tree
Date: Mon, 17 Aug 2009 16:50:51 +1000 [thread overview]
Message-ID: <20090817165051.765262cd.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the tip tree got a conflict in
kernel/trace/trace.h between commit
9ec04da7489d2c9ae01ea6e9b5fa313ccf3d35fb ("net: skb ftracer - Add actual
ftrace code to kernel (v3)") from the net tree and commit
64c12e0444fcc6b75eb49144ba46d43dbdc6bc8f ("tracing: Add individual
syscalls tracepoint id support") from the tip tree.
Just overlapping additions/removals. I fixed it up (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc kernel/trace/trace.h
index 8a6281b,300ef78..0000000
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@@ -336,12 -317,6 +334,8 @@@ extern void __ftrace_bad_type(void)
TRACE_KMEM_ALLOC); \
IF_ASSIGN(var, ent, struct kmemtrace_free_entry, \
TRACE_KMEM_FREE); \
- IF_ASSIGN(var, ent, struct syscall_trace_enter, \
- TRACE_SYSCALL_ENTER); \
- IF_ASSIGN(var, ent, struct syscall_trace_exit, \
- TRACE_SYSCALL_EXIT); \
+ IF_ASSIGN(var, ent, struct trace_skb_event, \
+ TRACE_SKB_SOURCE); \
__ftrace_bad_type(); \
} while (0)
next reply other threads:[~2009-08-17 6:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-17 6:50 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-05-13 3:10 linux-next: manual merge of the tip tree with the tree Stephen Rothwell
2011-05-13 8:03 ` Ralf Baechle
2011-05-31 0:19 Stephen Rothwell
2011-08-18 4:14 Stephen Rothwell
2014-03-11 19:03 Mark Brown
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=20090817165051.765262cd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=fweisbec@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jbaron@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=peterz@infradead$(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