From: Vinod Koul <vinod.koul@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Chris Ball <chris@printf.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>, Balaji T K <balajitk@ti.com>
Subject: Re: linux-next: manual merge of the mmc tree with the slave-dma tree
Date: Mon, 26 May 2014 16:31:09 +0530 [thread overview]
Message-ID: <20140526110109.GD21128@intel.com> (raw)
In-Reply-To: <20140523152310.05323045@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1548 bytes --]
On Fri, May 23, 2014 at 03:23:10PM +1000, Stephen Rothwell wrote:
> Hi Chris,
>
> Today's linux-next merge of the mmc tree got a conflict in
> include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
> hide filter_fn for built-in drivers") from the slave-dma tree and
> commit ee526d515ad1 ("mmc: omap_hsmmc: split omap-dma header file")
> from the mmc tree.
>
> I fixed it up (I effectively applied the former commit to the new file)
> and can carry the fix as necessary (no action is required).
Looks fine to me
Thanks
--
~Vinod
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 23 May 2014 15:19:48 +1000
> Subject: [PATCH] dmaengine: omap: fix for code movement
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> include/linux/omap-dmaengine.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h
> index 2b0b6aa01922..8e6906c72e90 100644
> --- a/include/linux/omap-dmaengine.h
> +++ b/include/linux/omap-dmaengine.h
> @@ -10,7 +10,7 @@
>
> struct dma_chan;
>
> -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
> +#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
> bool omap_dma_filter_fn(struct dma_chan *, void *);
> #else
> static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
> --
> 2.0.0.rc4
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
--
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2014-05-26 11:01 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-23 5:23 linux-next: manual merge of the mmc tree with the slave-dma tree Stephen Rothwell
2014-05-26 11:01 ` Vinod Koul [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-07-22 1:44 Stephen Rothwell
2012-02-23 0:40 Stephen Rothwell
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=20140526110109.GD21128@intel.com \
--to=vinod.koul@intel.com \
--cc=arnd@arndb.de \
--cc=balajitk@ti.com \
--cc=chris@printf.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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;
as well as URLs for NNTP newsgroup(s).