From: Linus Torvalds Date: Fri, 11 Apr 2014 23:45:59 +0000 (-0700) Subject: Merge git://git.infradead.org/users/willy/linux-nvme X-Git-Tag: v3.15-rc1~21 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e8072d48b2dd0898e99698018b2045f8cd49965;p=pandora-kernel.git Merge git://git.infradead.org/users/willy/linux-nvme Pull NVMe driver updates from Matthew Wilcox: "Various updates to the NVMe driver. The most user-visible change is that drive hotplugging now works and CPU hotplug while an NVMe drive is installed should also work better" * git://git.infradead.org/users/willy/linux-nvme: NVMe: Retry failed commands with non-fatal errors NVMe: Add getgeo to block ops NVMe: Start-stop nvme_thread during device add-remove. NVMe: Make I/O timeout a module parameter NVMe: CPU hot plug notification NVMe: per-cpu io queues NVMe: Replace DEFINE_PCI_DEVICE_TABLE NVMe: Fix divide-by-zero in nvme_trans_io_get_num_cmds NVMe: IOCTL path RCU protect queue access NVMe: RCU protected access to io queues NVMe: Initialize device reference count earlier NVMe: Add CONFIG_PM_SLEEP to suspend/resume functions --- 3e8072d48b2dd0898e99698018b2045f8cd49965 Reading git-diff-tree failed