From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Jul 2008 19:03:18 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: v2.6.27-rc1~852
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5554b35933245e95710d709175e14c02cbc956a4;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits)
  I/OAT: I/OAT version 3.0 support
  I/OAT: tcp_dma_copybreak default value dependent on I/OAT version
  I/OAT: Add watchdog/reset functionality to ioatdma
  iop_adma: cleanup iop_chan_xor_slot_count
  iop_adma: document how to calculate the minimum descriptor pool size
  iop_adma: directly reclaim descriptors on allocation failure
  async_tx: make async_tx_test_ack a boolean routine
  async_tx: remove depend_tx from async_tx_sync_epilog
  async_tx: export async_tx_quiesce
  async_tx: fix handling of the "out of descriptor" condition in async_xor
  async_tx: ensure the xor destination buffer remains dma-mapped
  async_tx: list_for_each_entry_rcu() cleanup
  dmaengine: Driver for the Synopsys DesignWare DMA controller
  dmaengine: Add slave DMA interface
  dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap
  dmaengine: Add dma_client parameter to device_alloc_chan_resources
  dmatest: Simple DMA memcpy test client
  dmaengine: DMA engine driver for Marvell XOR engine
  iop-adma: fix platform driver hotplug/coldplug
  dmaengine: track the number of clients using a channel
  ...

Fixed up conflict in drivers/dca/dca-sysfs.c manually
---

5554b35933245e95710d709175e14c02cbc956a4
diff --cc drivers/dca/dca-sysfs.c
index 9a70377bfb3,3d47e9d8e34..7af4b403bd2
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
@@@ -13,10 -13,10 +13,11 @@@ static spinlock_t dca_idr_lock
  int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)
  {
  	struct device *cd;
+ 	static int req_count;
  
 -	cd = device_create(dca_class, dca->cd, MKDEV(0, slot + 1),
 -			   "requester%d", req_count++);
 +	cd = device_create_drvdata(dca_class, dca->cd,
 +				   MKDEV(0, slot + 1), NULL,
- 				   "requester%d", slot);
++				   "requester%d", req_count++);
  	if (IS_ERR(cd))
  		return PTR_ERR(cd);
  	return 0;