diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-30 13:39:04 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-30 13:39:04 -0700 | 
| commit | fb64638566588392e4a544760b649fd7f857e33a (patch) | |
| tree | f31ebdb2f7def1b8001e2ba78ad831d83ebeac9d /net/lapb/lapb_timer.c | |
| parent | 9f8f16c86e4d9e2afcbdcd6045981c4d9129450e (diff) | |
| parent | 52bd456a66c1abb7dd43628080025703248b1ea2 (diff) | |
Merge tag 'for-linus-20180830' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
 "Small collection of fixes that should go into this series. This pull
  contains:
   - NVMe pull request with three small fixes (via Christoph)
   - Kill useless NULL check before kmem_cache_destroy (Chengguang Xu)
   - Xen block driver pull request with persistent grant flushing fixes
     (Juergen Gross)
   - Final wbt fixes, wrapping up the changes for this series. These
     have been heavily tested (me)
   - cdrom info leak fix (Scott Bauer)
   - ATA dma quirk for SQ201 (Linus Walleij)
   - Straight forward bsg refcount_t conversion (John Pittman)"
* tag 'for-linus-20180830' of git://git.kernel.dk/linux-block:
  cdrom: Fix info leak/OOB read in cdrom_ioctl_drive_status
  nvmet: free workqueue object if module init fails
  nvme-fcloop: Fix dropped LS's to removed target port
  nvme-pci: add a memory barrier to nvme_dbbuf_update_and_check_event
  block: bsg: move atomic_t ref_count variable to refcount API
  block: remove unnecessary condition check
  ata: ftide010: Add a quirk for SQ201
  blk-wbt: remove dead code
  blk-wbt: improve waking of tasks
  blk-wbt: abstract out end IO completion handler
  xen/blkback: remove unused pers_gnts_lock from struct xen_blkif_ring
  xen/blkback: move persistent grants flags to bool
  xen/blkfront: reorder tests in xlblk_init()
  xen/blkfront: cleanup stale persistent grants
  xen/blkback: don't keep persistent grants too long
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions
