From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from coco.kroah.org (kroah.org [198.145.64.141]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "coco.kroah.org", Issuer "Greg KH" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 92F2BDDE08 for ; Thu, 4 Dec 2008 15:47:12 +1100 (EST) Date: Wed, 3 Dec 2008 20:21:54 -0800 From: Greg KH To: Stephen Rothwell Subject: Re: linux-next: manual merge of the driver-core tree Message-ID: <20081204042154.GA18027@kroah.com> References: <20081204104418.97f848b4.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20081204104418.97f848b4.sfr@canb.auug.org.au> Cc: Kay Sievers , linuxppc-dev@ozlabs.org, linux-next@vger.kernel.org, Paul Mackerras List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Thu, Dec 04, 2008 at 10:44:18AM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/powerpc/platforms/85xx/mpc85xx_mds.c between commit > 24a99596f7465274a8e65ddd29a7d9028969b9f9 ("powerpc/85xx: Fix compile > warnings in mpc85xx_mds.c") from the galak tree and commit > f58f23751464d095f9942304bc5f6072b79a2cc3 ("powerpc: struct device - > replace bus_id with dev_name(), dev_set_name()") from the driver-core > tree. > > I fixed it up (see below) and can carry the fix as necessary. > > Paul, maybe you should apply the patch from the driver-core tree as it > was cc'd to you and all its prerequisites are upstream. Yes, Paul, please apply the patch, and let me know. It will make things much easier in the end for everyone involved. thanks, greg k-h