linux-kernel - Re: linux-next: manual merge of the driver-core tree with the slave-dma tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20121129051846.GE4375@kroah.com>
Date:	Wed, 28 Nov 2012 21:18:46 -0800
From:	Greg KH <greg@...ah.com>
To:	Viresh Kumar <viresh.kumar@...aro.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bill Pemberton <wfp5p@...ginia.edu>,
	Vinod Koul <vinod.koul@...el.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the
 slave-dma tree

On Thu, Nov 29, 2012 at 09:16:06AM +0530, Viresh Kumar wrote:
> On 29 November 2012 09:10, Stephen Rothwell <sfr@...b.auug.org.au> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/