From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751149Ab2K2FRM (ORCPT ); Thu, 29 Nov 2012 00:17:12 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:46150 "EHLO out4-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750721Ab2K2FRJ (ORCPT ); Thu, 29 Nov 2012 00:17:09 -0500 X-Sasl-enc: QUNCdP3Aisi4Jwdz91iL77JQas1w0MhU1JNJUdN1ljuu 1354166228 Date: Wed, 28 Nov 2012 21:18:46 -0800 From: Greg KH To: Viresh Kumar Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Bill Pemberton , Vinod Koul Subject: Re: linux-next: manual merge of the driver-core tree with the slave-dma tree Message-ID: <20121129051846.GE4375@kroah.com> References: <20121129144042.add4ee11c35fa8d5f5876282@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Nov 29, 2012 at 09:16:06AM +0530, Viresh Kumar wrote: > On 29 November 2012 09:10, Stephen Rothwell wrote: > > diff --cc drivers/dma/dw_dmac.c > > > +#ifdef CONFIG_OF > > +static struct dw_dma_platform_data * > > +__devinit dw_dma_parse_dt(struct platform_device *pdev) > > Do we need a separate patch to fix this place? I believe yes. Don't worry about that for now, I'll sweep the tree after 3.8-rc1 is out to catch stuff like this. Otherwise the merge issues are going to be even worse. Or, you can fix this in the slave-dma tree if you want. > > - static int __devinit dw_probe(struct platform_device *pdev) > > + static int dw_probe(struct platform_device *pdev) > > Thanks for this. Me too, thanks Stephen, and sorry for the problems this caused. greg k-h