From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Sep 2013 22:00:11 +0000 (-0700)
Subject: Merge branch 'for-3.12/core' of git://git.kernel.dk/linux-block
X-Git-Tag: firefly_0821_release~176^2~5264
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68cf8d0c720cdb76dc912c983d8dae9de6d6e5cf;p=firefly-linux-kernel-4.4.55.git

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

68cf8d0c720cdb76dc912c983d8dae9de6d6e5cf