diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-31 18:42:21 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-31 18:42:21 -0700 | 
| commit | 501d9f79451aff460c3b50c73706494d7ba82d72 (patch) | |
| tree | 737f4db174eb727ae7342165cf2baf2f78827ab8 /lib/memory-notifier-error-inject.c | |
| parent | 73adb8c5b0ea15e3942ab5781eb3e72d4e028ada (diff) | |
| parent | 7ef10f3cddb56c65881301d6b4d39c475369be5d (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
 "Unfortunately a few issues that warrant sending another pull request,
  even if I had hoped to avoid it. This contains:
   - A fix for multiqueue xen-blkback, on tear down / disconnect.
   - A few fixups for NVMe, including a wrong bit definition, fix for
     host memory buffers, and an nvme rdma page size fix"
* 'for-linus' of git://git.kernel.dk/linux-block:
  nvme: fix the definition of the doorbell buffer config support bit
  nvme-pci: use dma memory for the host memory buffer descriptors
  nvme-rdma: default MR page size to 4k
  xen-blkback: stop blkback thread of every queue in xen_blkif_disconnect
Diffstat (limited to 'lib/memory-notifier-error-inject.c')
0 files changed, 0 insertions, 0 deletions
