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 ...		2013-05-07 20:49:51 -07:00
..
acl.c
acl.h
balloc.c
bitmap.c
dir.c
ext3_jbd.c
ext3.h
file.c
fsync.c
hash.c
ialloc.c
inode.c	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
ioctl.c
Kconfig
Makefile
namei.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
namei.h
resize.c
super.c	make blkdev_put() return void	2013-05-07 02:16:31 -04:00
symlink.c
xattr_security.c
xattr_trusted.c
xattr_user.c
xattr.c
xattr.h