Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull asm-generic cleanups from Arnd Bergmann:
 "The asm-generic changes for 4.4 are mostly a series from Christoph
  Hellwig to clean up various abuses of headers in there.  The patch to
  rename the io-64-nonatomic-*.h headers caused some conflicts with new
  users, so I added a workaround that we can remove in the next merge
  window.

  The only other patch is a warning fix from Marek Vasut"

* tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h
  asm-generic: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
  gpio-mxc: stop including <asm-generic/bug>
  n_tracesink: stop including <asm-generic/bug>
  n_tracerouter: stop including <asm-generic/bug>
  mlx5: stop including <asm-generic/kmap_types.h>
  hifn_795x: stop including <asm-generic/kmap_types.h>
  drbd: stop including <asm-generic/kmap_types.h>
  move count_zeroes.h out of asm-generic
  move io-64-nonatomic*.h out of asm-generic

diff --cc drivers/acpi/nfit.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/mfd/intel-lpss.c
index 001a7d7708cee1ad84a53839c8c687582331e649,fdf4d5c1add24c74ce9fccbbd49fdf7910c3aa64..6255513f54c7c2df29da53edb6a1dd2521b2dd4e
--- 1/drivers/mfd/intel-lpss.c
--- 2/drivers/mfd/intel-lpss.c
+++ b/drivers/mfd/intel-lpss.c
@@@ -25,8 -25,6 +25,7 @@@
  #include <linux/pm_qos.h>
  #include <linux/pm_runtime.h>
  #include <linux/seq_file.h>
- 
- #include <asm-generic/io-64-nonatomic-lo-hi.h>
++#include <linux/io-64-nonatomic-lo-hi.h>
  
  #include "intel-lpss.h"
  

diff --cc drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker.c
Simple merge

diff --cc drivers/nvme/host/pci.c
index e878590e71b68ad3863ddc83006e76420996a4f4,c962527305f7c1c32df4b398983181c752f040b3..9f4fe3a5f41e459624ee245874c9b2d50bad2404
--- 1/drivers/nvme/host/pci.c
--- 2/drivers/block/nvme-core.c
+++ b/drivers/nvme/host/pci.c
@@@ -39,13 -40,8 +39,13 @@@
  #include <linux/slab.h>
  #include <linux/t10-pi.h>
  #include <linux/types.h>
 +#include <linux/pr.h>
  #include <scsi/sg.h>
- #include <asm-generic/io-64-nonatomic-lo-hi.h>
+ #include <linux/io-64-nonatomic-lo-hi.h>
 +#include <asm/unaligned.h>
 +
 +#include <uapi/linux/nvme_ioctl.h>
 +#include "nvme.h"
  
  #define NVME_MINORS           (1U << MINORBITS)
  #define NVME_Q_DEPTH          1024

diff --cc drivers/usb/host/xhci.h
index be9048e2d4d4f1cc4f40003e89c2553358420122,dbda41e91c843f2e289c4a4aa0d4129f2641f2a9..0b9451250e33f5f82fd52f00cf05338849b81e7c
--- 1/drivers/usb/host/xhci.h
--- 2/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -28,8 -28,6 +28,7 @@@
  #include <linux/timer.h>
  #include <linux/kernel.h>
  #include <linux/usb/hcd.h>
- 
- #include <asm-generic/io-64-nonatomic-lo-hi.h>
++#include <linux/io-64-nonatomic-lo-hi.h>
  
  /* Code sharing between pci-quirks and xhci hcd */
  #include      "xhci-ext-caps.h"

diff --cc lib/mpi/mpicoder.c
Simple merge