You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 5af43c24ca Merge branch 'akpm' (incoming from Andrew) ... Merge more incoming from Andrew Morton: - Various fixes which were stalled or which I picked up recently - A large rotorooting of the AIO code. Allegedly to improve performance but I don't really have good performance numbers (I might have lost the email) and I can't raise Kent today. I held this out of 3.9 and we could give it another cycle if it's all too late/scary. I ended up taking only the first two thirds of the AIO rotorooting. I left the percpu parts and the batch completion for later. - Linus * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (33 commits) aio: don't include aio.h in sched.h aio: kill ki_retry aio: kill ki_key aio: give shared kioctx fields their own cachelines aio: kill struct aio_ring_info aio: kill batch allocation aio: change reqs_active to include unreaped completions aio: use cancellation list lazily aio: use flush_dcache_page() aio: make aio_read_evt() more efficient, convert to hrtimers wait: add wait_event_hrtimeout() aio: refcounting cleanup aio: make aio_put_req() lockless aio: do fget() after aio_get_req() aio: dprintk() -> pr_debug() aio: move private stuff out of aio.h aio: add kiocb_cancel() aio: kill return value of aio_complete() char: add aio_{read,write} to /dev/{null,zero} aio: remove retry-based AIO ...		12 years ago
..
Kconfig	ext4: fix Kconfig documentation for CONFIG_EXT4_DEBUG	12 years ago
Makefile	ext4: Remove CONFIG_EXT4_FS_XATTR	12 years ago
acl.c	ext4: fix the number of credits needed for acl ops with inline data	12 years ago
acl.h	fs: take the ACL checks to common code	14 years ago
balloc.c	ext4: mark all metadata I/O with REQ_META	12 years ago
bitmap.c	ext4: Checksum the block bitmap properly with bigalloc enabled	12 years ago
block_validity.c	ext2/3/4: delete unneeded includes of module.h	13 years ago
dir.c	ext4: fix readdir error in the case of inline_data+dir_index	12 years ago
ext4.h	ext4: fix readdir error in the case of inline_data+dir_index	12 years ago
ext4_extents.h	ext4: mext_insert_extents should update extent block checksum	12 years ago
ext4_jbd2.c	ext4: mark metadata blocks using bh flags	12 years ago
ext4_jbd2.h	ext4: improve credit estimate for EXT4_SINGLEDATA_TRANS_BLOCKS	12 years ago
extents.c	ext4: mext_insert_extents should update extent block checksum	12 years ago
extents_status.c	ext4: update extent status tree after an extent is zeroed out	12 years ago
extents_status.h	ext4: update extent status tree after an extent is zeroed out	12 years ago
file.c	aio: don't include aio.h in sched.h	12 years ago
fsync.c	ext4/jbd2: don't wait (forever) for stale tid caused by wraparound	12 years ago
hash.c	ext4: reduce one "if" comparison in ext4_dirhash()	12 years ago
ialloc.c	ext4: mark all metadata I/O with REQ_META	12 years ago
indirect.c	aio: don't include aio.h in sched.h	12 years ago
inline.c	ext4: fix readdir error in case inline_data+^dir_index.	12 years ago
inode.c	aio: don't include aio.h in sched.h	12 years ago
ioctl.c	ext4: fix usless declarations	12 years ago
mballoc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
mballoc.h	ext4: use module parameters instead of debugfs for mballoc_debug	12 years ago
migrate.c	ext4: do not convert to indirect with bigalloc enabled	12 years ago
mmp.c	ext4: mark all metadata I/O with REQ_META	12 years ago
move_extent.c	ext4: mext_insert_extents should update extent block checksum	12 years ago
namei.c	ext4: fix readdir error in the case of inline_data+dir_index	12 years ago
page-io.c	aio: don't include aio.h in sched.h	12 years ago
resize.c	ext4: add check for inodes_count overflow in new resize ioctl	12 years ago
super.c	make blkdev_put() return void	12 years ago
symlink.c	ext4: Remove CONFIG_EXT4_FS_XATTR	12 years ago
truncate.h	ext4: move common truncate functions to header file	14 years ago
xattr.c	ext4: fix miscellaneous big endian warnings	12 years ago
xattr.h	ext4: reserve xattr index for Rich ACL support	12 years ago
xattr_security.c	Merge branch 'for_linus' into for_linus_merged	13 years ago
xattr_trusted.c	ext2/3/4: delete unneeded includes of module.h	13 years ago
xattr_user.c	ext2/3/4: delete unneeded includes of module.h	13 years ago