From: Greg KH <greg@kroah.com>
To: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Bill Pemberton <wfp5p@virginia.edu>,
Vinod Koul <vinod.koul@intel.com>
Subject: Re: linux-next: manual merge of the driver-core tree with the slave-dma tree
Date: Wed, 28 Nov 2012 21:18:46 -0800 [thread overview]
Message-ID: <20121129051846.GE4375@kroah.com> (raw)
In-Reply-To: <CAKohpokZJqEvpDcZ8nf2d6DB1JXb=LB-8LY9OqT8REf0KjAOuQ@mail.gmail.com>
On Thu, Nov 29, 2012 at 09:16:06AM +0530, Viresh Kumar wrote:
> On 29 November 2012 09:10, Stephen Rothwell <sfr@canb.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
prev parent reply other threads:[~2012-11-29 5:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-29 3:40 linux-next: manual merge of the driver-core tree with the slave-dma tree Stephen Rothwell
2012-11-29 3:46 ` Viresh Kumar
2012-11-29 5:18 ` Greg KH [this message]
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=20121129051846.GE4375@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@linaro.org \
--cc=wfp5p@virginia.edu \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox