Merge remote-tracking branch 'dmaengine/next'

diff --cc drivers/dma/dmaengine.c
Simple merge

diff --cc drivers/dma/ioat/dma.c
Simple merge

diff --cc drivers/dma/ioat/dma.h
index c7888bccd9740c6cefba7719c1e33cc724a7152d,8bebddd189c7ebfba9701951427ae93f3cee8cc0..5e8fe01ba69d574c3eef5cf0cb8f3ab765fb7c72
--- 1/drivers/dma/ioat/dma.h
--- 2/drivers/dma/ioat/dma.h
+++ b/drivers/dma/ioat/dma.h
@@@ -88,8 -88,9 +88,8 @@@ struct ioatdma_device 
  struct ioat_chan_common {
        struct dma_chan common;
        void __iomem *reg_base;
-       unsigned long last_completion;
+       dma_addr_t last_completion;
        spinlock_t cleanup_lock;
 -      dma_cookie_t completed_cookie;
        unsigned long state;
        #define IOAT_COMPLETION_PENDING 0
        #define IOAT_COMPLETION_ACK 1

diff --cc drivers/dma/ioat/dma_v2.c
Simple merge

diff --cc drivers/dma/ioat/dma_v3.c
Simple merge

diff --cc drivers/dma/iop-adma.c
Simple merge

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

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge