From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jun 2015 23:35:00 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: submit/tizen/20160607.132125~2377
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8a7deb362b764cd557380a3c753f0118304eaa77;p=sdk%2Femulator%2Femulator-kernel.git

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

Pull block layer fixes from Jens Axboe:
 "Sending this off now, as I'm not aware of other current bugs, nor do I
  expect further fixes before 4.1 final.  This contains two fixes:

   - a fix for a bdi unregister warning that gets spewed on md, due to a
     regression introduced earlier in this cycle.  From Neil Brown.

   - a fix for a compile warning for NVMe on 32-bit platforms, also a
     regression introduced in this cycle.  From Arnd Bergmann"

* 'for-linus' of git://git.kernel.dk/linux-block:
  NVMe: fix type warning on 32-bit
  block: discard bdi_unregister() in favour of bdi_destroy()
---

8a7deb362b764cd557380a3c753f0118304eaa77