From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Dave Jones <davej@redhat.com>
Cc: linuxppc-dev list <linuxppc-dev@ozlabs.org>,
akpm <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
Kumar Gala <kumar.gala@freescale.com>
Subject: Re: [git pull] Please pull from powerpc.git merge branch
Date: Wed, 16 Jul 2008 15:01:35 +1000 [thread overview]
Message-ID: <1216184495.7740.158.camel@pasglop> (raw)
In-Reply-To: <20080716042042.GA13212@redhat.com>
On Wed, 2008-07-16 at 00:20 -0400, Dave Jones wrote:
> On Wed, Jul 16, 2008 at 11:34:03AM +1000, Ben Herrenschmidt wrote:
> > Linus,
> >
> > I apologize in advance for the couple of merge commits in there. I
> > merged your tree yesterday in order to fix a (fairly minor) conflict,
> > and waited for our autobuilder to test a whole bunch of configs
> > overnight before asking you to pull, at which point, sfr informed me of
> > a bunch of this time non-trivial conflicts with whatever you pulled in
> > the meantime...
> >
> > So here it is with 2 merge csets at the top, I'll try to do better next
> > time. I don't want to rebase or my sub-maintainers will hate me.
> >
> > So please pull from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
>
> Boom!
>
> arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe':
> /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang'
> /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register'
>
> .config is at http://davej.fedorapeople.org/kernel-2.6.27-ppc.config
Kumar, I think that's your realm, what's up there ?
Cheers,
Ben.
WARNING: multiple messages have this Message-ID (diff)
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Dave Jones <davej@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
linuxppc-dev list <linuxppc-dev@ozlabs.org>,
akpm <akpm@linux-foundation.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
Kumar Gala <kumar.gala@freescale.com>
Subject: Re: [git pull] Please pull from powerpc.git merge branch
Date: Wed, 16 Jul 2008 15:01:35 +1000 [thread overview]
Message-ID: <1216184495.7740.158.camel@pasglop> (raw)
In-Reply-To: <20080716042042.GA13212@redhat.com>
On Wed, 2008-07-16 at 00:20 -0400, Dave Jones wrote:
> On Wed, Jul 16, 2008 at 11:34:03AM +1000, Ben Herrenschmidt wrote:
> > Linus,
> >
> > I apologize in advance for the couple of merge commits in there. I
> > merged your tree yesterday in order to fix a (fairly minor) conflict,
> > and waited for our autobuilder to test a whole bunch of configs
> > overnight before asking you to pull, at which point, sfr informed me of
> > a bunch of this time non-trivial conflicts with whatever you pulled in
> > the meantime...
> >
> > So here it is with 2 merge csets at the top, I'll try to do better next
> > time. I don't want to rebase or my sub-maintainers will hate me.
> >
> > So please pull from:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge
>
> Boom!
>
> arch/powerpc/platforms/built-in.o: In function `ep8248e_mdio_probe':
> /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:129: undefined reference to `alloc_mdio_bitbang'
> /builddir/build/BUILD/kernel-2.6.26/linux-2.6.26.ppc/arch/powerpc/platforms/82xx/ep8248e.c:143: undefined reference to `mdiobus_register'
>
> .config is at http://davej.fedorapeople.org/kernel-2.6.27-ppc.config
Kumar, I think that's your realm, what's up there ?
Cheers,
Ben.
next prev parent reply other threads:[~2008-07-16 5:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 1:34 [git pull] Please pull from powerpc.git merge branch Benjamin Herrenschmidt
2008-07-16 1:48 ` Benjamin Herrenschmidt
2008-07-16 4:20 ` Dave Jones
2008-07-16 4:20 ` Dave Jones
2008-07-16 5:01 ` Benjamin Herrenschmidt [this message]
2008-07-16 5:01 ` Benjamin Herrenschmidt
2008-07-16 12:46 ` Kumar Gala
2008-07-16 12:46 ` Kumar Gala
2008-07-16 8:51 ` Arnd Bergmann
2008-07-16 8:51 ` Arnd Bergmann
2008-07-16 11:13 ` Benjamin Herrenschmidt
2008-07-16 11:13 ` Benjamin Herrenschmidt
2008-07-16 12:48 ` Kumar Gala
-- strict thread matches above, loose matches on Subject: below --
2008-07-22 7:32 Benjamin Herrenschmidt
2008-07-22 13:11 ` Kumar Gala
2008-07-22 13:11 ` Kumar Gala
2008-07-25 8:13 Benjamin Herrenschmidt
2008-07-25 15:07 ` Kumar Gala
2008-07-25 15:07 ` Kumar Gala
2008-07-25 21:43 ` Benjamin Herrenschmidt
2008-07-25 21:43 ` Benjamin Herrenschmidt
2008-07-25 18:10 ` Linus Torvalds
2008-07-25 18:55 ` Grant Likely
2008-07-25 18:55 ` Grant Likely
2008-07-25 23:11 Benjamin Herrenschmidt
2008-07-26 0:38 ` Linus Torvalds
2008-07-26 4:28 ` Benjamin Herrenschmidt
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=1216184495.7740.158.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=kumar.gala@freescale.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=torvalds@linux-foundation.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 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.