Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com...

Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  NVMe: Fix filesystem deadlock on removal
  NVMe: Failed controller initialization fixes
  NVMe: Unify controller probe and resume
  NVMe: Automatic namespace rescan
  block: add blk_set_queue_dying() to blkdev.h
  NVMe: Don't use fake status on cancelled command
  NVMe: Fix device cleanup on initialization failure
  NVMe: add sysfs and ioctl controller reset
  NVMe: Return busy status on suspended queue