From: Frederic Weisbecker <fweisbec@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: Re: linux-next: manual merge of the percpu tree with the tip tree
Date: Wed, 3 Feb 2010 23:26:21 +0100 [thread overview]
Message-ID: <20100203222616.GF5068@nowhere> (raw)
In-Reply-To: <20100203163822.2742bcc5.sfr@canb.auug.org.au>
On Wed, Feb 03, 2010 at 04:38:22PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the percpu tree got a conflict in
> include/linux/ftrace_event.h, include/trace/ftrace.h,
> kernel/trace/trace_kprobe.c, kernel/trace/trace_syscalls.c and
> kernel/trace/trace_event_profile.c between commit
> 430ad5a600a83956749307b13257c464c3826b55 ("perf: Factorize trace events
> raw sample buffer operations") from the tip tree and commit
> eeb721be6bc03fe37755e69ab5c3ba2fe9897fd9 ("percpu: add __percpu sparse
> annotations to trace") from the percpu tree.
>
> I attempted to fix them up (see below) but someone should check the
> result carefully. (The apparently unchanged files below used the tip
> tree versions.)
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
I'm not very used to review patches on patches :)
But yeah that looks good to me.
Thanks!
next prev parent reply other threads:[~2010-02-03 22:26 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-03 5:38 linux-next: manual merge of the percpu tree with the tip tree Stephen Rothwell
2010-02-03 22:26 ` Frederic Weisbecker [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-10-09 4:50 Stephen Rothwell
2014-10-09 13:13 ` Frederic Weisbecker
2014-10-09 13:15 ` Tejun Heo
2014-10-09 13:18 ` Frederic Weisbecker
2012-05-16 7:36 Stephen Rothwell
2012-05-16 7:36 ` Stephen Rothwell
2012-05-16 13:40 ` Alex Shi
2011-04-20 3:50 Stephen Rothwell
2011-04-20 3:50 ` Stephen Rothwell
2011-02-11 3:58 Stephen Rothwell
2011-02-11 9:52 ` Tejun Heo
2011-01-05 2:54 Stephen Rothwell
2011-01-05 2:54 ` Stephen Rothwell
2010-12-31 2:55 Stephen Rothwell
2010-12-31 2:55 ` Stephen Rothwell
2010-12-31 11:17 ` Tejun Heo
2010-12-31 2:55 Stephen Rothwell
2010-12-31 2:55 ` Stephen Rothwell
2010-12-10 2:32 Stephen Rothwell
2010-12-10 2:32 ` Stephen Rothwell
2009-12-14 4:30 Stephen Rothwell
2009-11-11 7:59 Stephen Rothwell
2009-09-03 9:11 Stephen Rothwell
2009-07-06 5:06 Stephen Rothwell
2009-07-06 5:06 ` 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=20100203222616.GF5068@nowhere \
--to=fweisbec@gmail.com \
--cc=cl@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=rusty@rustcorp.com.au \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=xiaoguangrong@cn.fujitsu.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.