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: linux-next@vger.kernel.org,
	Arjan van de Ven <arjan@linux.intel.com>,
	Dave Hansen <haveblue@us.ibm.com>, Greg KH <greg@kroah.com>
Subject: Re: linux-next: manual merge of the fastboot tree
Date: Fri, 15 Aug 2008 09:50:06 +0200	[thread overview]
Message-ID: <20080815075006.GA2399@elte.hu> (raw)
In-Reply-To: <20080815174415.985eb69c.sfr@canb.auug.org.au>


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

> Hi Ingo,
> 
> Today's linux-next merge of the fastboot tree got a trivial conflict 
> in include/linux/init.h between commit 
> 95fc5687f58152d62904e7dea36dca3a52514160 ("Dave Hansen 
> <haveblue@us.ibm.com>") from the driver-core tree and commit 

[ sidenote: interesting commit name ;-) ]

> a06e1c2b448b317bc141934879cbbbed8319b4d4 ("modules: extend 
> initcall_debug functionality to the module loader") from the fastboot 
> tree.
> 
> Just overlapping additions.  I fixed it up and will carry the fix.

thanks.

> [I have been asked to try adding the merge result diff, so just as a 
> test I have included it below.]

that's a very good idea!

[ The inlining seems a bit weird though - Mutt didnt show it in its
  default form, it only showed up when i did a reply to the mail. 
  Strange. I use mutt-1.5.18-2.fc8. ]

	Ingo

  reply	other threads:[~2008-08-15  7:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-15  7:44 linux-next: manual merge of the fastboot tree Stephen Rothwell
2008-08-15  7:50 ` Ingo Molnar [this message]
2008-08-15  7:57   ` 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=20080815075006.GA2399@elte.hu \
    --to=mingo@elte.hu \
    --cc=arjan@linux.intel.com \
    --cc=greg@kroah.com \
    --cc=haveblue@us.ibm.com \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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.