diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-29 14:52:14 -0700 | 
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-29 14:52:14 -0700 | 
| commit | 291d0e5d81e101392379217b06251fe8c27f1f80 (patch) | |
| tree | 25a790625bf5a763f96956710ce8e7c9589cab88 /scripts/bpf_helpers_doc.py | |
| parent | e75417739b1de4f6eb99f3f080c67bfd6812d562 (diff) | |
| parent | 133424a207774d3d32a38d560c6469ed31c0472f (diff) | |
Merge tag 'for-linus-20180929' of git://git.kernel.dk/linux-block
Jens writes:
  "Block fixes for 4.19-rc6
   A set of fixes that should go into this release. This pull request
   contains:
   - A fix (hopefully) for the persistent grants for xen-blkfront. A
     previous fix from this series wasn't complete, hence reverted, and
     this one should hopefully be it. (Boris Ostrovsky)
   - Fix for an elevator drain warning with SMR devices, which is
     triggered when you switch schedulers (Damien)
   - bcache deadlock fix (Guoju Fang)
   - Fix for the block unplug tracepoint, which has had the
     timer/explicit flag reverted since 4.11 (Ilya)
   - Fix a regression in this series where the blk-mq timeout hook is
     invoked with the RCU read lock held, hence preventing it from
     blocking (Keith)
   - NVMe pull from Christoph, with a single multipath fix (Susobhan Dey)"
* tag 'for-linus-20180929' of git://git.kernel.dk/linux-block:
  xen/blkfront: correct purging of persistent grants
  Revert "xen/blkfront: When purging persistent grants, keep them in the buffer"
  blk-mq: I/O and timer unplugs are inverted in blktrace
  bcache: add separate workqueue for journal_write to avoid deadlock
  xen/blkfront: When purging persistent grants, keep them in the buffer
  block: fix deadline elevator drain for zoned block devices
  blk-mq: Allow blocking queue tag iter callbacks
  nvme: properly propagate errors in nvme_mpath_init
Diffstat (limited to 'scripts/bpf_helpers_doc.py')
0 files changed, 0 insertions, 0 deletions
