From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Apr 2013 19:05:41 +0000 (-0700)
Subject: Merge tag 'for-linus-20130409' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.9-rc7~34
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=27387dd8c62d24140d80382918aff69d4e0821ce;p=cascardo%2Flinux.git

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

Pull block fixes from Jens Axboe:
 "I've got a few smaller fixes queued up for 3.9 that should go in.  The
  major one is the loop regression, the others are nice fixes on their
  own though.  It contains:

   - Fix for unitialized var in the block sysfs code, courtesy of Arnd
     and gcc-4.8.

   - Two fixes for mtip32xx, fixing probe and command timeout.  Also a
     debug measure that could have waited for 3.10, but it's driver
     only, so I let it slip in.

   - Revert the loop partition cleanup fix, it could cause a deadlock on
     auto-teardown as part of umount.  The fix is clear, but at this
     point we just want to revert it and get a real fix in for 3.10."

* tag 'for-linus-20130409' of git://git.kernel.dk/linux-block:
  Revert "loop: cleanup partitions when detaching loop device"
  mtip32xx: fix two smatch warnings
  mtip32xx: Add debugfs entry device_status
  mtip32xx: return 0 from pci probe in case of rebuild
  mtip32xx: recovery from command timeout
  block: avoid using uninitialized value in from queue_var_store
---

27387dd8c62d24140d80382918aff69d4e0821ce