From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 5 Nov 2015 01:18:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'block/for-next'
X-Git-Tag: KARO-TXUL-2015-12-04~87
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=ac87668f97db4623ce06f2d0f0cbb888e63113fb

Merge remote-tracking branch 'block/for-next'
---

ac87668f97db4623ce06f2d0f0cbb888e63113fb
diff --cc drivers/nvme/host/pci.c
index a2b3e40f1dc5,264716effc6c..9f4fe3a5f41e
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@@ -40,8 -39,13 +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