From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
linux-next@vger•kernel.org,
Mathieu Desnoyers <mathieu.desnoyers@polymtl•ca>,
Jason Baron <jbaron@redhat•com>
Subject: Re: linux-next: manual merge of the ftrace tree
Date: Wed, 20 Aug 2008 20:33:08 -0700 [thread overview]
Message-ID: <20080821033308.GA23468@kroah.com> (raw)
In-Reply-To: <20080821130903.1df56278.sfr@canb.auug.org.au>
On Thu, Aug 21, 2008 at 01:09:03PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> [I have reported this previously but something has changed slightly.]
>
> Today's linux-next merge of the ftrace tree got a conflict in
> kernel/module.c between commit bf8b9a59e335ca159aa4b3878ced0e94ea74cbc4
> ("driver core: basic infrastructure for per-module dynamic debug
> messages") from the driver-core tree and commit
> e543dff1468a55cdff9932dd3a806524790cf0b3 ("tracing: Kernel Tracepoints")
> from the ftrace tree.
>
> Just overlapping additions. I fixed it up (see below).
Merge looks good to me.
thanks,
greg k-h
next prev parent reply other threads:[~2008-08-21 3:48 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 3:09 linux-next: manual merge of the ftrace tree Stephen Rothwell
2008-08-21 3:33 ` Greg KH [this message]
2008-08-21 4:03 ` Mathieu Desnoyers
-- 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-12-01 0:37 Stephen Rothwell
2008-12-01 7:40 ` 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-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=20080821033308.GA23468@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=jbaron@redhat$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mathieu.desnoyers@polymtl$(echo .)ca \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
--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