From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Nov 2012 22:06:05 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-block
X-Git-Tag: v3.7-rc7~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8946afe5a3519bf4fd84d87f94c92d49f2f13d8;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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

Pull block layer fixes from Jens Axboe:
 "Distilled down version of bug fixes for 3.7.  The patches have been
  well tested.  If you notice that commit dates are from today, it's
  because I pulled less important bits out and shuffled them into the
  3.8 mix.  Apart from that, no changes, base still the same.

  It contains:

   - Fix for aoe, don't run request_fn while it's plugged.

   - Fix for a regression in floppy since 3.6, which causes problems if
     no floppy is found.

   - Stable fix for blk_exec(), don't touch a request after it has been
     sent to the scheduler (and the device as well).

   - Five fixes for various nasties in mtip32xx."

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: Don't access request after it might be freed
  mtip32xx: Fix padding issue
  aoe: avoid running request handler on plugged queue
  mtip32xx: fix potential NULL pointer dereference in mtip_timeout_function()
  mtip32xx: fix shift larger than type warning
  mtip32xx: Fix incorrect mask used for erase mode
  mtip32xx: Fix to make lba address correct in big-endian systems
  mtip32xx: fix potential crash on SEC_ERASE_UNIT
  dm: fix deadlock with request based dm and queue request_fn recursion
  floppy: destroy floppy workqueue before cleaning up the queue
---

a8946afe5a3519bf4fd84d87f94c92d49f2f13d8