linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
	akpm <akpm@linux-foundation.org>,
	Linux Kernel list <linux-kernel@vger.kernel.org>
Subject: Re: [git pull] Please pull from powerpc.git merge branch
Date: Fri, 25 Jul 2008 11:10:56 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.1.10.0807251108320.5249@nehalem.linux-foundation.org> (raw)
In-Reply-To: <1216973590.11188.99.camel@pasglop>



On Fri, 25 Jul 2008, Benjamin Herrenschmidt wrote:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Ok, I got a conflict in arch/powerpc/platforms/52xx/Kconfig, you should 
check that I fixed it up right and send me follow-up patches if required.

		Linus

  parent reply	other threads:[~2008-07-25 18:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-25  8:13 [git pull] Please pull from powerpc.git merge branch Benjamin Herrenschmidt
2008-07-25 15:07 ` Kumar Gala
2008-07-25 21:43   ` Benjamin Herrenschmidt
2008-07-25 18:10 ` Linus Torvalds [this message]
2008-07-25 18:55   ` Grant Likely
  -- strict thread matches above, loose matches on Subject: below --
2008-07-25 23:11 Benjamin Herrenschmidt
2008-07-26  0:38 ` Linus Torvalds
2008-07-26  4:28   ` Benjamin Herrenschmidt
2008-07-22  7:32 Benjamin Herrenschmidt
2008-07-22 13:11 ` Kumar Gala
2008-07-16  1:34 Benjamin Herrenschmidt
2008-07-16  1:48 ` Benjamin Herrenschmidt
2008-07-16  4:20 ` Dave Jones
2008-07-16  5:01   ` Benjamin Herrenschmidt
2008-07-16 12:46     ` Kumar Gala
2008-07-16  8:51   ` Arnd Bergmann
2008-07-16 11:13     ` Benjamin Herrenschmidt
2008-07-16 12:48       ` Kumar Gala

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=alpine.LFD.1.10.0807251108320.5249@nehalem.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    /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;
as well as URLs for NNTP newsgroup(s).