From: Sam Ravnborg <sam@ravnborg.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>,
acme@redhat.com, srostedt@redhat.com,
linux-kernel@vger.kernel.org, Pekka Paalanen <pq@iki.fi>,
Pavel Roskin <proski@gnu.org>,
Soeren Sandmann Pedersen <sandmann@redhat.com>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: Re: [PATCH 0/2]: Add sparc64 ftrace support.
Date: Wed, 14 May 2008 08:51:56 +0200 [thread overview]
Message-ID: <20080514065156.GA3159@uranus.ravnborg.org> (raw)
In-Reply-To: <20080514063055.GA21369@elte.hu>
>
> [ also a patch integration detail: i took the liberty to move your
> arch/sparc64/Kconfig's HAVE_FTRACE to the first spot of the SPARC64
> select lines as per the second patch below - your patch had a conflict
> against current mainline (which probably means you already changed
> this file in your Sparc64 tree). By moving that entry to the first
> line your tree and the ftrace tree should auto-merge just fine without
> any conflicts. ]
When adding new select entries I try to keep them sorted alphabetically.
It will not solve all the merge issues but as the list grows this should
help. At least betterthan adding to the end.
Sam
next prev parent reply other threads:[~2008-05-14 6:51 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-14 5:06 [PATCH 0/2]: Add sparc64 ftrace support David Miller
2008-05-14 6:30 ` Ingo Molnar
2008-05-14 6:51 ` Sam Ravnborg [this message]
2008-05-14 7:01 ` Ingo Molnar
2008-05-14 7:11 ` David Miller
2008-05-14 7:18 ` Ingo Molnar
2008-05-17 4:01 ` [PATCH] ftrace: add have dynamic ftrace config for archs Steven Rostedt
2008-05-19 15:21 ` Ingo Molnar
2008-05-14 13:09 ` [PATCH 0/2]: Add sparc64 ftrace support Steven Rostedt
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=20080514065156.GA3159@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=pq@iki.fi \
--cc=proski@gnu.org \
--cc=rostedt@goodmis.org \
--cc=sandmann@redhat.com \
--cc=srostedt@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox