- git-md-accel-fixes.patch removed from -mm tree

- git-md-accel-fixes.patch removed from -mm tree

[akpm]

The patch titled
     git-md-accel fixes
has been removed from the -mm tree.  Its filename was
     git-md-accel-fixes.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: git-md-accel fixes
From: Andrew Morton <akpm@linux-foundation.org>

include/linux/dmaengine.h: In function 'dma_sync_wait':
include/linux/dmaengine.h:508: error: 'jiffies' undeclared (first use in this function)
include/linux/dmaengine.h:508: error: (Each undeclared identifier is reported only once
include/linux/dmaengine.h:508: error: for each function it appears in.)
include/linux/dmaengine.h:508: warning: implicit declaration of function 'msecs_to_jiffies'
include/linux/dmaengine.h:513: warning: implicit declaration of function 'time_after_eq'
In file included from include/linux/sched.h:51,
                 from include/linux/mm.h:4,
                 from crypto/internal.h:18,
                 from crypto/algapi.c:22:
include/linux/jiffies.h: At top level:
include/linux/jiffies.h:266: error: conflicting types for 'msecs_to_jiffies'
include/linux/dmaengine.h:508: error: previous implicit declaration of 'msecs_to_jiffies' was here

That function is too big to e inlined anyway - move it out-of-line.

Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Chris Leech <christopher.leech@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/dma/dmaengine.c   |   19 +++++++++++++++++++
 include/linux/dmaengine.h |   18 +-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff -puN drivers/dma/dmaengine.c~git-md-accel-fixes drivers/dma/dmaengine.c
--- a/drivers/dma/dmaengine.c~git-md-accel-fixes
+++ a/drivers/dma/dmaengine.c
@@ -66,6 +66,7 @@
 #include <linux/percpu.h>
 #include <linux/rcupdate.h>
 #include <linux/mutex.h>
+#include <linux/jiffies.h>
 
 static DEFINE_MUTEX(dma_list_mutex);
 static LIST_HEAD(dma_device_list);
@@ -165,6 +166,24 @@ static struct dma_chan *dma_client_chan_
 	return NULL;
 }
 
+enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie)
+{
+	enum dma_status status;
+	unsigned long dma_sync_wait_timeout = jiffies + msecs_to_jiffies(5000);
+
+	dma_async_issue_pending(chan);
+	do {
+		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
+		if (time_after_eq(jiffies, dma_sync_wait_timeout)) {
+			printk(KERN_ERR "dma_sync_wait_timeout!\n");
+			return DMA_ERROR;
+		}
+	} while (status == DMA_IN_PROGRESS);
+
+	return status;
+}
+EXPORT_SYMBOL(dma_sync_wait);
+
 /**
  * dma_chan_cleanup - release a DMA channel's resources
  * @kref: kernel reference structure that contains the DMA channel device
diff -puN include/linux/dmaengine.h~git-md-accel-fixes include/linux/dmaengine.h
--- a/include/linux/dmaengine.h~git-md-accel-fixes
+++ a/include/linux/dmaengine.h
@@ -501,23 +501,7 @@ static inline enum dma_status dma_async_
 	return DMA_IN_PROGRESS;
 }
 
-static inline enum dma_status dma_sync_wait(struct dma_chan *chan,
-						dma_cookie_t cookie)
-{
-	enum dma_status status;
-	unsigned long dma_sync_wait_timeout = jiffies + msecs_to_jiffies(5000);
-
-	dma_async_issue_pending(chan);
-	do {
-		status = dma_async_is_tx_complete(chan, cookie, NULL, NULL);
-		if (time_after_eq(jiffies, dma_sync_wait_timeout)) {
-			printk(KERN_ERR "dma_sync_wait_timeout!\n");
-			return DMA_ERROR;
-		}
-	} while (status == DMA_IN_PROGRESS);
-
-	return status;
-}
+enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie);
 
 /* --- DMA device --- */
 
_

Patches currently in -mm which might be from akpm@linux-foundation.org are

origin.patch
git-acpi.patch
git-arm.patch
git-powerpc.patch
git-drm.patch
git-dvb.patch
git-input.patch
setstream-param-for-psmouse-tweak.patch
sis-warning-fixes.patch
git-mips-fixup.patch
git-mtd.patch
git-netdev-all.patch
e1000-fix-shared-interrupt-warning-message-fix.patch
Fabric7-VIOC-driver-fixes.patch
revert-drivers-net-tulip-dmfe-support-basic-carrier-detection.patch
dmfe-add-support-for-suspend-resume-fix.patch
git-s390.patch
git-scsi-misc.patch
revert-md-avoid-possible-bug_on-in-md-bitmap-handling-for-git-block.patch
git-block-fixup.patch
git-unionfs-fixup.patch
after-before-x86_64-mm-mmconfig-share.patch
smaps-add-clear_refs-file-to-clear-reference-fix.patch
fix-rmmod-read-write-races-in-proc-entries-fix.patch
kprobes-list-all-active-probes-in-the-system.patch
reduce-size-of-task_struct-on-64-bit-machines-fix.patch
mm-shrink-parent-dentries-when-shrinking-slab.patch
add-epoll-compat-code-to-kernel-compatc-tidy.patch
genalloc-warning-fixes.patch
call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
revert-x86_64-mm-putreg-check.patch
utrace-vs-reduce-size-of-task_struct-on-64-bit-machines.patch
git-gccbug-fixup.patch