tree a45c77db6c2e6ad300125bf54943d9df16b87b6e
parent 3e0cc09a3a2c40ec1ffb6b4e12da86e98feccb11
parent ffe51f0142a291a957eebb9687cafb15f2b3fc14
author Linus Torvalds <torvalds@linux-foundation.org> 1508352220 -0400
committer Linus Torvalds <torvalds@linux-foundation.org> 1508352220 -0400

Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Three small fixes:

   - A fix for skd, it was using kfree() to free a structure allocate
     with kmem_cache_alloc().

   - Stable fix for nbd, fixing a regression using the normal ioctl
     based tools.

   - Fix for a previous fix in this series, that fixed up
     inconsistencies between buffered and direct IO"

* 'for-linus' of git://git.kernel.dk/linux-block:
  fs: Avoid invalidation in interrupt context in dio_complete()
  nbd: don't set the device size until we're connected
  skd: Use kmem_cache_free