]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:45:01 +0000 (10:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Jan 2011 18:45:01 +0000 (10:45 -0800)
commit1b128c5ad30f46a6a9bf7ecbee14f3b83fd0fa7c
treed249bccc80c64443dab211639050c4fb14332648
parent59a76f73c1ae5dba6a140613c1deaa83dc2424be
parentabae2e2a3bb33edc3cfe0dd5c17b6756cdf8fbc0
Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block

* 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits)
  block: ensure that completion error gets properly traced
  blktrace: add missing probe argument to block_bio_complete
  block cfq: don't use atomic_t for cfq_group
  block cfq: don't use atomic_t for cfq_queue
  block: trace event block fix unassigned field
  block: add internal hd part table references
  block: fix accounting bug on cross partition merges
  kref: add kref_test_and_get
  bio-integrity: mark kintegrityd_wq highpri and CPU intensive
  block: make kblockd_workqueue smarter
  Revert "sd: implement sd_check_events()"
  block: Clean up exit_io_context() source code.
  Fix compile warnings due to missing removal of a 'ret' variable
  fs/block: type signature of major_to_index(int) to major_to_index(unsigned)
  block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p)
  cfq-iosched: don't check cfqg in choose_service_tree()
  fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors
  cdrom: export cdrom_check_events()
  sd: implement sd_check_events()
  sr: implement sr_check_events()
  ...
25 files changed:
block/blk-merge.c
block/cfq-iosched.c
block/ioctl.c
drivers/md/dm-table.c
drivers/md/md.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
fs/block_dev.c
fs/btrfs/volumes.c
fs/btrfs/volumes.h
fs/char_dev.c
fs/ext3/super.c
fs/ext4/super.c
fs/gfs2/ops_fstype.c
fs/nfsd/vfs.c
fs/nilfs2/super.c
fs/ocfs2/cluster/heartbeat.c
fs/reiserfs/journal.c
fs/splice.c
fs/super.c
fs/xfs/linux-2.6/xfs_super.c
include/linux/blkdev.h
include/linux/fs.h
include/scsi/scsi.h
kernel/power/swap.c