diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 05:05:27 +0300 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 05:05:27 +0300 | 
| commit | a39ef1a7c6093bbd4e0a8197350b99cd635e5446 (patch) | |
| tree | 5a19d1d1f289c52be72710f1d7cd954c830964f6 /scripts/mod/empty.c | |
| parent | d82312c80860b8b83cd4473ac6eafd244e712061 (diff) | |
| parent | 976f2ab4985a1dbe3f3f0777ce01d4fdb404c62a (diff) | |
| download | linux-a39ef1a7c6093bbd4e0a8197350b99cd635e5446.tar.xz | |
Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block
Pull block driver updates from Jens Axboe:
 "This is the block driver pull request for 4.1.  As with the core bits,
  this is a relatively slow round.  This pull request contains:
   - Various fixes and cleanups for NVMe, from Alexey Khoroshilov, Chong
     Yuan, myself, Keith Busch, and Murali Iyer.
   - Documentation and code cleanups for nbd from Markus Pargmann.
   - Change of brd maintainer to me, from Ross Zwisler.  At least the
     email doesn't bounce anymore then.
   - Two xen-blkback fixes from Tao Chen"
* 'for-4.1/drivers' of git://git.kernel.dk/linux-block: (23 commits)
  NVMe: Meta data handling through submit io ioctl
  NVMe: Add translation for block limits
  NVMe: Remove check for null
  NVMe: Fix error handling of class_create("nvme")
  xen-blkback: define pr_fmt macro to avoid the duplication of DRV_PFX
  xen-blkback: enlarge the array size of blkback name
  nbd: Return error pointer directly
  nbd: Return error code directly
  nbd: Remove fixme that was already fixed
  nbd: Restructure debugging prints
  nbd: Fix device bytesize type
  nbd: Replace kthread_create with kthread_run
  nbd: Remove kernel internal header
  Documentation: nbd: Add list of module parameters
  Documentation: nbd: Reformat to allow more documentation
  NVMe: increase depth of admin queue
  nvme: Fix PRP list calculation for non-4k system page size
  NVMe: Fix blk-mq hot cpu notification
  NVMe: embedded iod mask cleanup
  NVMe: Freeze admin queue on device failure
  ...
Diffstat (limited to 'scripts/mod/empty.c')
0 files changed, 0 insertions, 0 deletions
