All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@elte.hu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	linux-next@vger.kernel.org,
	Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>,
	Jason Baron <jbaron@redhat.com>, Greg KH <greg@kroah.com>,
	Steven Rostedt <rostedt@goodmis.org>
Subject: Re: linux-next: manual merge of the ftrace tree
Date: Mon, 25 Aug 2008 11:16:43 +0200	[thread overview]
Message-ID: <20080825091643.GD9114@elte.hu> (raw)
In-Reply-To: <20080825120140.af8e1fb5.sfr@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi All,
> 
> On Fri, 15 Aug 2008 11:54:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Today's linux-next merge of the ftrace tree got a conflict in
> > kernel/module.c between commit 1b75321c2d0561d9ecfe3794fa939264f3eb7e26
> > ("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.
> > 
> > Overlapping additions.  I fixed it up. Probably worth a look once I
> > publish the tree.
> 
> Today this has expanded to include commit 
> be1c870c22e9b27170b5dd5028b6eaf2aab7b508 ("ftrace: enable mcount 
> recording for modules") also from the ftrace tree.  I have fixed it up 
> as below.

Thanks Stephen. I suspect there's not much we can do at this point to 
resolve this conflict sooner than at the linux-next level, as Rusty uses 
Quilt queues.

	Ingo

  reply	other threads:[~2008-08-25  9:17 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-15  1:54 linux-next: manual merge of the ftrace tree Stephen Rothwell
2008-08-25  2:01 ` Stephen Rothwell
2008-08-25  9:16   ` Ingo Molnar [this message]
2008-08-25 11:56     ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2008-08-21  3:09 Stephen Rothwell
2008-08-21  3:33 ` Greg KH
2008-08-21  4:03 ` Mathieu Desnoyers
2008-10-14  5:03 Stephen Rothwell
2008-10-14  6:26 ` Ingo Molnar
2008-10-14  7:00   ` Stephen Rothwell
2008-11-24  0:11 Stephen Rothwell
2008-11-24  2:11 ` Ingo Molnar
2008-11-24  2:23   ` Stephen Rothwell
2008-12-01  0:37 Stephen Rothwell
2008-12-01  7:40 ` Ingo Molnar
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

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=20080825091643.GD9114@elte.hu \
    --to=mingo@elte.hu \
    --cc=greg@kroah.com \
    --cc=hpa@zytor.com \
    --cc=jbaron@redhat.com \
    --cc=linux-next@vger.kernel.org \
    --cc=mathieu.desnoyers@polymtl.ca \
    --cc=rostedt@goodmis.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /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.