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

diff --cc arch/avr32/mach-at32ap/at32ap700x.c
Simple merge

diff --cc crypto/async_tx/async_tx.c
Simple merge

diff --cc drivers/dca/dca-sysfs.c
index 9a70377,3d47e9d..7af4b40
--- 1/drivers/dca/dca-sysfs.c
--- 2/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;

diff --cc include/linux/pci_ids.h
Simple merge

diff --cc net/core/user_dma.c
Simple merge