From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Oct 2017 18:43:40 +0000 (-0400)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v5.15~10217
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=020b3023762fdf6cc816ed154e3b1f8eafaf0836;p=platform%2Fkernel%2Flinux-starfive.git

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
---

020b3023762fdf6cc816ed154e3b1f8eafaf0836