Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 17:16:26 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 17:16:26 +0000 (10:16 -0700)
commit6c5103890057b1bb781b26b7aae38d33e4c517d8
treee6e57961dcddcb5841acb34956e70b9dc696a880
parent3dab04e6978e358ad2307bca563fabd6c5d2c58b
parent9d2e157d970a73b3f270b631828e03eb452d525e
Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block: (65 commits)
  Documentation/iostats.txt: bit-size reference etc.
  cfq-iosched: removing unnecessary think time checking
  cfq-iosched: Don't clear queue stats when preempt.
  blk-throttle: Reset group slice when limits are changed
  blk-cgroup: Only give unaccounted_time under debug
  cfq-iosched: Don't set active queue in preempt
  block: fix non-atomic access to genhd inflight structures
  block: attempt to merge with existing requests on plug flush
  block: NULL dereference on error path in __blkdev_get()
  cfq-iosched: Don't update group weights when on service tree
  fs: assign sb->s_bdi to default_backing_dev_info if the bdi is going away
  block: Require subsystems to explicitly allocate bio_set integrity mempool
  jbd2: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  jbd: finish conversion from WRITE_SYNC_PLUG to WRITE_SYNC and explicit plugging
  fs: make fsync_buffers_list() plug
  mm: make generic_writepages() use plugging
  blk-cgroup: Add unaccounted time to timeslice_used.
  block: fixup plugging stubs for !CONFIG_BLOCK
  block: remove obsolete comments for blkdev_issue_zeroout.
  blktrace: Use rq->cmd_flags directly in blk_add_trace_rq.
  ...

Fix up conflicts in fs/{aio.c,super.c}
48 files changed:
block/blk-core.c
block/blk-lib.c
drivers/block/amiflop.c
drivers/block/xsysace.c
drivers/md/bitmap.c
drivers/md/md.c
drivers/scsi/scsi_lib.c
drivers/staging/hv/blkvsc_drv.c
drivers/target/target_core_iblock.c
fs/adfs/inode.c
fs/aio.c
fs/bio.c
fs/btrfs/disk-io.c
fs/btrfs/extent_io.c
fs/btrfs/inode.c
fs/direct-io.c
fs/exofs/inode.c
fs/fat/inode.c
fs/fuse/inode.c
fs/gfs2/aops.c
fs/gfs2/log.c
fs/gfs2/lops.c
fs/gfs2/meta_io.c
fs/hpfs/file.c
fs/nilfs2/inode.c
fs/reiserfs/inode.c
fs/super.c
fs/sync.c
fs/ubifs/super.c
fs/udf/file.c
fs/udf/inode.c
fs/ufs/inode.c
fs/ufs/truncate.c
fs/xfs/linux-2.6/xfs_aops.c
fs/xfs/linux-2.6/xfs_buf.c
include/linux/fs.h
include/linux/pagemap.h
include/linux/sched.h
include/linux/swap.h
kernel/fork.c
kernel/sched.c
mm/filemap.c
mm/memory-failure.c
mm/nommu.c
mm/page-writeback.c
mm/shmem.c
mm/swapfile.c
mm/vmscan.c