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
..
cpu	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-04-30 08:15:40 -07:00
debug	kgdb/sysrq: fix inconstistent help message of sysrq key	2013-04-30 17:04:10 -07:00
events	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
gcov
irq	irqdomain: Allow quiet failure mode	2013-05-06 11:37:43 +10:00
power	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2013-05-02 19:40:34 -07:00
sched	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
time	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
trace	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-04-30 07:41:01 -07:00
.gitignore	kernel/hz.bc: ignore.	2013-04-22 07:09:06 -07:00
acct.c	fs: Fix hang with BSD accounting on frozen filesystem	2013-05-04 14:57:58 -04:00
async.c	async: rename and redefine async_func_ptr	2013-03-12 13:59:14 -07:00
audit_tree.c	kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()	2013-04-29 15:54:26 -07:00
audit_watch.c
audit.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
audit.h	audit: remove unnecessary #if CONFIG_AUDIT	2013-04-29 15:54:26 -07:00
auditfilter.c	kernel/auditfilter.c: tree and watch will memory leak when failure occurs	2013-04-29 15:54:26 -07:00
auditsc.c	kernel/auditsc.c: use kzalloc instead of kmalloc+memset	2013-04-29 15:54:26 -07:00
backtracetest.c
bounds.c
capability.c	Add file_ns_capable() helper function for open-time capability checking	2013-04-14 10:06:31 -07:00
cgroup_freezer.c
cgroup.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
compat.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2013-05-01 07:21:43 -07:00
configs.c	proc: Supply PDE attribute setting accessor functions	2013-05-01 17:29:18 -04:00
context_tracking.c
cpu_pm.c
cpu.c
cpuset.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
crash_dump.c
cred.c
delayacct.c
dma.c
elfcore.c
exec_domain.c
exit.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
extable.c	extable: Flip the sorting message	2013-04-15 13:25:16 +02:00
fork.c	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
freezer.c
futex_compat.c
futex.c	futex: fix kernel-doc notation and spello	2013-03-12 20:42:10 -07:00
groups.c
hrtimer.c	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
hung_task.c
irq_work.c
itimer.c
jump_label.c
kallsyms.c	kernel: kallsyms: memory override issue, need check destination buffer length	2013-04-15 15:17:26 +09:30
kcmp.c
Kconfig.freezer
Kconfig.hz
Kconfig.locks
Kconfig.preempt
kexec.c	kexec: Use min() and min_t() to simplify logic	2013-04-30 17:04:07 -07:00
kmod.c	kmod: remove call_usermodehelper_fns()	2013-04-30 17:04:06 -07:00
kprobes.c	kprobes: Fix a double lock bug of kprobe_mutex	2013-04-18 08:58:38 -07:00
ksysfs.c
kthread.c	kthread: implement probe_kthread_data()	2013-04-30 17:04:02 -07:00
latencytop.c
lglock.c
lockdep_internals.h
lockdep_proc.c
lockdep_states.h
lockdep.c	lockdep: Consolidate bug messages into a single print_lockdep_off() function	2013-04-26 08:37:22 +02:00
Makefile	We get rid of the general module prefix confusion with a binary config option,	2013-05-05 10:58:06 -07:00
modsign_certificate.S	CONFIG_SYMBOL_PREFIX: cleanup.	2013-03-15 15:09:43 +10:30
modsign_pubkey.c
module_signing.c
module-internal.h
module.c	module: don't unlink the module until we've removed all exposure.	2013-04-17 13:23:02 +09:30
mutex-debug.c
mutex-debug.h
mutex.c	mutex: Back out architecture specific check for negative mutex count	2013-04-19 09:33:36 +02:00
mutex.h
notifier.c
nsproxy.c	proc: Split the namespace stuff out into linux/proc_ns.h	2013-05-01 17:29:39 -04:00
padata.c
panic.c	dump_stack: implement arch-specific hardware description in task dumps	2013-04-30 17:04:02 -07:00
params.c
pid_namespace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
pid.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
posix-cpu-timers.c	posix_timers: Fix pre-condition to stop the tick on full dynticks	2013-04-22 19:59:25 +02:00
posix-timers.c	posix-timers: Remove unused variable	2013-04-18 12:51:19 +02:00
printk.c	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
profile.c	proc: Supply PDE attribute setting accessor functions	2013-05-01 17:29:18 -04:00
ptrace.c	aio: don't include aio.h in sched.h	2013-05-07 20:16:25 -07:00
range.c	kernel/range.c: subtract_range: fix the broken phrase issued by printk	2013-04-30 17:04:01 -07:00
rcu.h
rcupdate.c
rcutiny_plugin.h
rcutiny.c
rcutorture.c
rcutree_plugin.h	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
rcutree_trace.c	rcutrace: single_open() leaks	2013-05-05 00:16:35 -04:00
rcutree.c	Merge commit '8700c95adb03' into timers/nohz	2013-05-02 17:54:19 +02:00
rcutree.h	Merge commit '8700c95adb03' into timers/nohz	2013-05-02 17:54:19 +02:00
relay.c	relay: use macro PAGE_ALIGN instead of FIX_SIZE	2013-04-30 17:04:09 -07:00
res_counter.c
resource.c	mem hotunplug: fix kfree() of bootmem memory	2013-04-29 15:54:40 -07:00
rtmutex_common.h
rtmutex-debug.c
rtmutex-debug.h
rtmutex-tester.c	locking/rtmutex/tester: Set correct permissions on sysfs files	2013-04-10 14:48:37 +02:00
rtmutex.c
rtmutex.h
rwsem.c
seccomp.c	seccomp: allow BPF_XOR based ALU instructions.	2013-03-26 11:07:19 +11:00
semaphore.c	semaphore: use `bool' type for semaphore_waiter's up	2013-04-30 17:04:08 -07:00
signal.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
smp.c	kernel/smp.c: cleanups	2013-04-30 17:04:03 -07:00
smpboot.c	kthread: Prevent unpark race which puts threads on the wrong cpu	2013-04-12 14:18:43 +02:00
smpboot.h
softirq.c	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
spinlock.c
srcu.c
stacktrace.c
stop_machine.c
sys_ni.c
sys.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal	2013-05-01 07:21:43 -07:00
sysctl_binary.c
sysctl.c	mm: replace hardcoded 3% with admin_reserve_pages knob	2013-04-29 15:54:36 -07:00
task_work.c
taskstats.c
test_kprobes.c	kernel/: rename random32() to prandom_u32()	2013-04-29 18:28:42 -07:00
time.c	timekeeping: Use inject_offset in warp_clock	2013-03-15 16:50:20 -07:00
timeconst.bc
timer.c	Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2013-05-05 13:23:27 -07:00
tracepoint.c	Tracing updates for Linux 3.10	2013-04-29 13:55:38 -07:00
tsacct.c
uid16.c
up.c
user_namespace.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
user-return-notifier.c
user.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
utsname_sysctl.c
utsname.c	proc: Split the namespace stuff out into linux/proc_ns.h	2013-05-01 17:29:39 -04:00
wait.c
watchdog.c	watchdog: Add comments to explain the watchdog_disabled variable	2013-03-14 08:24:05 +01:00
workqueue_internal.h	workqueue: include workqueue info when printing debug dump of a worker task	2013-04-30 17:04:02 -07:00
workqueue.c	workqueue: include workqueue info when printing debug dump of a worker task	2013-04-30 17:04:02 -07:00