Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

Pull dmaengine updates from Dan Williams:
 "Even though this has fixes marked for -stable, given the size and the
  needed conflict resolutions this is 3.18-rc1/merge-window material.

  These patches have been languishing in my tree for a long while.  The
  fact that I do not have the time to do proper/prompt maintenance of
  this tree is a primary factor in the decision to step down as
  dmaengine maintainer.  That and the fact that the bulk of drivers/dma/
  activity is going through Vinod these days.

  The net_dma removal has not been in -next.  It has developed simple
  conflicts against mainline and net-next (for-3.18).

  Continuing thanks to Vinod for staying on top of drivers/dma/.

  Summary:

   1/ Step down as dmaengine maintainer see commit 08223d80df38
      "dmaengine maintainer update"

   2/ Removal of net_dma, as it has been marked 'broken' since 3.13
      (commit 77873803363c "net_dma: mark broken"), without reports of
      performance regression.

   3/ Miscellaneous fixes"

* tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
  net: make tcp_cleanup_rbuf private
  net_dma: revert 'copied_early'
  net_dma: simple removal
  dmaengine maintainer update
  dmatest: prevent memory leakage on error path in thread
  ioat: Use time_before_jiffies()
  dmaengine: fix xor sources continuation
  dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()
  dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()
  dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call
  ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
  drivers: dma: Include appropriate header file in dca.c
  drivers: dma: Mark functions as static in dma_v3.c
  dma: mv_xor: Add DMA API error checks
  ioat/dca: Use dev_is_pci() to check whether it is pci device

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc MAINTAINERS
index f10ed3914ea85da75f4f61c86533dd04abcfce5e,8873ca6525219acfbcda1302be8ff51db5723a66..f107230fc73d55cecf122b7e262a3428e026262a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -4750,12 -4489,12 +4743,12 @@@ F:   drivers/platform/x86/intel_menlow.
  INTEL IA32 MICROCODE UPDATE SUPPORT
  M:    Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
  S:    Maintained
 -F:    arch/x86/kernel/microcode_core.c
 -F:    arch/x86/kernel/microcode_intel.c
 +F:    arch/x86/kernel/cpu/microcode/core*
 +F:    arch/x86/kernel/cpu/microcode/intel*
  
  INTEL I/OAT DMA DRIVER
- M:    Dan Williams <dan.j.williams@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
+ R:    Dan Williams <dan.j.williams@intel.com>
  L:    dmaengine@vger.kernel.org
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Supported

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/Makefile
Simple merge

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

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

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

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

diff --cc include/linux/skbuff.h
index abde271c18ae30989e6675708e70a6c9bb656300,bdbf7afad6b72a48f328f9eb1775979fcc4731e5..a17ba0881afb241b9055c96ff35ff8578ad00903
--- 1/include/linux/skbuff.h
--- 2/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@@ -575,17 -511,11 +574,14 @@@ struct sk_buff 
         * headers if needed
         */
        __u8                    encapsulation:1;
 -      /* 6/8 bit hole (depending on ndisc_nodetype presence) */
 +      __u8                    encap_hdr_csum:1;
 +      __u8                    csum_valid:1;
 +      __u8                    csum_complete_sw:1;
 +      /* 2/4 bit hole (depending on ndisc_nodetype presence) */
        kmemcheck_bitfield_end(flags2);
  
- #if defined CONFIG_NET_DMA || defined CONFIG_NET_RX_BUSY_POLL
-       union {
-               unsigned int    napi_id;
-               dma_cookie_t    dma_cookie;
-       };
+ #ifdef CONFIG_NET_RX_BUSY_POLL
+       unsigned int    napi_id;
  #endif
  #ifdef CONFIG_NETWORK_SECMARK
        __u32                   secmark;

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

diff --cc include/net/sock.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc kernel/sysctl_binary.c
Simple merge

diff --cc net/core/Makefile
Simple merge

diff --cc net/core/dev.c
index cf8a95f48cff472d19d931506968a22b6612a12c,5e37e9abe8c545b17ae43c77eadb2892d95d2edf..130d642202297205cd038fb2645970eab5d2b972
--- 1/net/core/dev.c
--- 2/net/core/dev.c
+++ b/net/core/dev.c
@@@ -1363,8 -1341,6 +1362,7 @@@ static int __dev_close_many(struct list
                        ops->ndo_stop(dev);
  
                dev->flags &= ~IFF_UP;
-               net_dmaengine_put();
 +              netpoll_poll_enable(dev);
        }
  
        return 0;

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

diff --cc net/dccp/proto.c
Simple merge

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

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

diff --cc net/ipv4/tcp_input.c
index a906e0200ff26144727a1c6c90718cf1fa492dde,1da0ade982361394e56126046ff71edb35a00176..0185eea59342a9318ba42a9eb2f77da900b53e91
--- 1/net/ipv4/tcp_input.c
--- 2/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@@ -73,8 -73,6 +73,7 @@@
  #include <net/inet_common.h>
  #include <linux/ipsec.h>
  #include <asm/unaligned.h>
- #include <net/netdma.h>
 +#include <linux/errqueue.h>
  
  int sysctl_tcp_timestamps __read_mostly = 1;
  int sysctl_tcp_window_scaling __read_mostly = 1;
@@@ -5252,17 -5210,11 +5191,11 @@@ void tcp_rcv_established(struct sock *s
                                        goto no_ack;
                        }
  
-                       if (!copied_early || tp->rcv_nxt != tp->rcv_wup)
-                               __tcp_ack_snd_check(sk, 0);
+                       __tcp_ack_snd_check(sk, 0);
  no_ack:
- #ifdef CONFIG_NET_DMA
-                       if (copied_early)
-                               __skb_queue_tail(&sk->sk_async_wait_queue, skb);
-                       else
- #endif
                        if (eaten)
                                kfree_skb_partial(skb, fragstolen);
 -                      sk->sk_data_ready(sk, 0);
 +                      sk->sk_data_ready(sk);
                        return;
                }
        }

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

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