From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Nov 2015 22:22:15 +0000 (-0800)
Subject: Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6-pxa1908~20139
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9cf5c095b65da63c08b928a7d0015d5d5dca8a66;p=linux.git

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

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
---

9cf5c095b65da63c08b928a7d0015d5d5dca8a66
diff --cc drivers/mfd/intel-lpss.c
index 001a7d7708ce,fdf4d5c1add2..6255513f54c7
--- a/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/nvme/host/pci.c
index e878590e71b6,c962527305f7..9f4fe3a5f41e
--- a/drivers/nvme/host/pci.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 be9048e2d4d4,dbda41e91c84..0b9451250e33
--- a/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"