public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Chris Ball <chris@printf•net>, Vinod Koul <vinod.koul@intel•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
	Arnd Bergmann <arnd@arndb•de>, Balaji T K <balajitk@ti•com>
Subject: linux-next: manual merge of the mmc tree with the slave-dma tree
Date: Fri, 23 May 2014 15:23:10 +1000	[thread overview]
Message-ID: <20140523152310.05323045@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]

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).

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: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2014-05-23  5:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-23  5:23 Stephen Rothwell [this message]
2014-05-26 11:01 ` linux-next: manual merge of the mmc tree with the slave-dma tree Vinod Koul
  -- 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=20140523152310.05323045@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=arnd@arndb$(echo .)de \
    --cc=balajitk@ti$(echo .)com \
    --cc=chris@printf$(echo .)net \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=vinod.koul@intel$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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