mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
6c51038900
* '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}
|
||
|---|---|---|
| .. | ||
| acl.c | ||
| endian24.h | ||
| file.c | ||
| inode.c | ||
| ioctl.c | ||
| jfs_acl.h | ||
| jfs_btree.h | ||
| jfs_debug.c | ||
| jfs_debug.h | ||
| jfs_dinode.h | ||
| jfs_dmap.c | ||
| jfs_dmap.h | ||
| jfs_dtree.c | ||
| jfs_dtree.h | ||
| jfs_extent.c | ||
| jfs_extent.h | ||
| jfs_filsys.h | ||
| jfs_imap.c | ||
| jfs_imap.h | ||
| jfs_incore.h | ||
| jfs_inode.c | ||
| jfs_inode.h | ||
| jfs_lock.h | ||
| jfs_logmgr.c | ||
| jfs_logmgr.h | ||
| jfs_metapage.c | ||
| jfs_metapage.h | ||
| jfs_mount.c | ||
| jfs_superblock.h | ||
| jfs_txnmgr.c | ||
| jfs_txnmgr.h | ||
| jfs_types.h | ||
| jfs_umount.c | ||
| jfs_unicode.c | ||
| jfs_unicode.h | ||
| jfs_uniupr.c | ||
| jfs_xattr.h | ||
| jfs_xtree.c | ||
| jfs_xtree.h | ||
| Kconfig | ||
| Makefile | ||
| namei.c | ||
| resize.c | ||
| super.c | ||
| symlink.c | ||
| xattr.c | ||