tree 41779dfce5cae3dc495f27f76ed8e66dd046ac4c
parent 0fbf2cc983ca15208545010863c6536d36a25f3a
parent f3cff25f05f2ac29b2ee355e611b0657482f6f1d
author Linus Torvalds <torvalds@linux-foundation.org> 1379887211 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1379887211 -0700

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

Pull block IO fixes from Jens Axboe:
 "After merge window, no new stuff this time only a collection of neatly
  confined and simple fixes"

* 'for-3.12/core' of git://git.kernel.dk/linux-block:
  cfq: explicitly use 64bit divide operation for 64bit arguments
  block: Add nr_bios to block_rq_remap tracepoint
  If the queue is dying then we only call the rq->end_io callout. This leaves bios setup on the request, because the caller assumes when the blk_execute_rq_nowait/blk_execute_rq call has completed that the rq->bios have been cleaned up.
  bio-integrity: Fix use of bs->bio_integrity_pool after free
  blkcg: relocate root_blkg setting and clearing
  block: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
  block: trace all devices plug operation