From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 17:33:36 +0000 (-0700)
Subject: Merge branch 'for-3.1/core' of git://git.kernel.dk/linux-block
X-Git-Tag: firefly_0821_release~3680^2~4944
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=096a705bbc080a4041636d07514560da8d78acbe;p=firefly-linux-kernel-4.4.55.git

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

* 'for-3.1/core' of git://git.kernel.dk/linux-block: (24 commits)
  block: strict rq_affinity
  backing-dev: use synchronize_rcu_expedited instead of synchronize_rcu
  block: fix patch import error in max_discard_sectors check
  block: reorder request_queue to remove 64 bit alignment padding
  CFQ: add think time check for group
  CFQ: add think time check for service tree
  CFQ: move think time check variables to a separate struct
  fixlet: Remove fs_excl from struct task.
  cfq: Remove special treatment for metadata rqs.
  block: document blk_plug list access
  block: avoid building too big plug list
  compat_ioctl: fix make headers_check regression
  block: eliminate potential for infinite loop in blkdev_issue_discard
  compat_ioctl: fix warning caused by qemu
  block: flush MEDIA_CHANGE from drivers on close(2)
  blk-throttle: Make total_nr_queued unsigned
  block: Add __attribute__((format(printf...) and fix fallout
  fs/partitions/check.c: make local symbols static
  block:remove some spare spaces in genhd.c
  block:fix the comment error in blkdev.h
  ...
---

096a705bbc080a4041636d07514560da8d78acbe