tree feb510b0e03f65ac382525cb01177033ceb8d346
parent 0adb32858b0bddf4ada5f364a84ed60b196dbcda
parent bc6d65e6dc89c3b7ff78e4ad797117c122ffde8e
author Jens Axboe <axboe@kernel.dk> 1522712521 -0600
committer Jens Axboe <axboe@kernel.dk> 1522712521 -0600

Merge branch 'for-4.17/block' into for-4.17/merged

* for-4.17/block: (139 commits)
  blk-mq: Directly schedule q->timeout_work when aborting a request
  blktrace: fix comment in blktrace_api.h
  lightnvm: remove function name in strings
  lightnvm: pblk: remove some unnecessary NULL checks
  lightnvm: pblk: don't recover unwritten lines
  lightnvm: pblk: implement 2.0 support
  lightnvm: pblk: implement get log report chunk
  lightnvm: pblk: rename ppaf* to addrf*
  lightnvm: pblk: check for supported version
  lightnvm: implement get log report chunk helpers
  lightnvm: make address conversions depend on generic device
  lightnvm: add support for 2.0 address format
  lightnvm: normalize geometry nomenclature
  lightnvm: complete geo structure with maxoc*
  lightnvm: add shorten OCSSD version in geo
  lightnvm: add minor version to generic geometry
  lightnvm: simplify geometry structure
  lightnvm: pblk: refactor init/exit sequences
  lightnvm: Avoid validation of default op value
  lightnvm: centralize permission check for lightnvm ioctl
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>