Merge git://git.infradead.org/users/willy/linux-nvme

Pull NVM Express driver update from Matthew Wilcox.

* git://git.infradead.org/users/willy/linux-nvme:
  NVMe: Merge issue on character device bring-up
  NVMe: Handle ioremap failure
  NVMe: Add pci suspend/resume driver callbacks
  NVMe: Use normal shutdown
  NVMe: Separate controller init from disk discovery
  NVMe: Separate queue alloc/free from create/delete
  NVMe: Group pci related actions in functions
  NVMe: Disk stats for read/write commands only
  NVMe: Bring up cdev on set feature failure
  NVMe: Fix checkpatch issues
  NVMe: Namespace IDs are unsigned
  NVMe: Update nvme_id_power_state with latest spec
  NVMe: Split header file into user-visible and kernel-visible pieces
  NVMe: Call nvme_process_cq from submission path
  NVMe: Remove "process_cq did something" message
  NVMe: Return correct value from interrupt handler
  NVMe: Disk IO statistics
  NVMe: Restructure MSI / MSI-X setup
  NVMe: Use kzalloc instead of kmalloc+memset

diff --combined include/uapi/linux/Kbuild
index e7c94eeb9475e4a9e9667704ce54b31b8dada428,a5e677a7070feef8937f5530a48feb0eb0ae2d91..115add2515aaad2bc5caebd1bf330060fee75ebc
--- 1/include/uapi/linux/Kbuild
--- 2/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@@ -62,7 -62,6 +62,7 @@@ header-y += auxvec.
  header-y += ax25.h
  header-y += b1lli.h
  header-y += baycom.h
 +header-y += bcm933xx_hcs.h
  header-y += bfs_fs.h
  header-y += binfmts.h
  header-y += blkpg.h
@@@ -227,7 -226,6 +227,7 @@@ header-y += kvm_para.
  endif
  
  header-y += l2tp.h
 +header-y += libc-compat.h
  header-y += limits.h
  header-y += llc.h
  header-y += loop.h
@@@ -263,7 -261,6 +263,7 @@@ header-y += net_dropmon.
  header-y += net_tstamp.h
  header-y += netconf.h
  header-y += netdevice.h
 +header-y += netlink_diag.h
  header-y += netfilter.h
  header-y += netfilter_arp.h
  header-y += netfilter_bridge.h
@@@ -284,6 -281,7 +284,7 @@@ header-y += nfs_mount.
  header-y += nfsacl.h
  header-y += nl80211.h
  header-y += nubus.h
+ header-y += nvme.h
  header-y += nvram.h
  header-y += omap3isp.h
  header-y += omapfb.h