From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <benh@kernel.crashing.org>
Received: from gate.crashing.org (gate.crashing.org [63.228.1.57])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by ozlabs.org (Postfix) with ESMTPS id 11DBFDDE08
	for <linuxppc-dev@ozlabs.org>; Wed, 16 Jul 2008 15:31:27 +1000 (EST)
Subject: Re: [git pull] Please pull from powerpc.git merge branch
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Dave Jones <davej@redhat.com>
In-Reply-To: <20080716042042.GA13212@redhat.com>
References: <1216172043.7740.136.camel@pasglop>
	<20080716042042.GA13212@redhat.com>
Content-Type: text/plain
Date: Wed, 16 Jul 2008 15:01:35 +1000
Message-Id: <1216184495.7740.158.camel@pasglop>
Mime-Version: 1.0
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>
Reply-To: benh@kernel.crashing.org
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/options/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev@ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request@ozlabs.org?subject=subscribe>

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.