Theodore Ts'o a107e5a3a4 Merge branch 'next' into upstream-merge ...

Conflicts:
	fs/ext4/inode.c
	fs/ext4/mballoc.c
	include/trace/events/ext4.h

2010-10-27 23:44:47 -04:00

..

bkl.h

…

block.h

…

ext4.h

Merge branch 'next' into upstream-merge

2010-10-27 23:44:47 -04:00

gfpflags.h

…

irq.h

tracing: Cleanup the convoluted softirq tracepoints

2010-10-21 16:50:29 +02:00

jbd2.h

ext4,jbd2: convert tracepoints to use major/minor numbers

2010-10-27 22:08:50 -04:00

kmem.h

…

kvm.h

…

lock.h

…

mce.h

…

module.h

…

napi.h

napi: Convert trace_napi_poll to TRACE_EVENT

2010-09-07 17:51:01 +02:00

net.h

netdev: Add tracepoints to netdev layer

2010-09-07 17:51:33 +02:00

power.h

tracing, perf: Add more power related events

2010-09-17 09:10:43 +02:00

sched.h

tracing/sched: Add sched_pi_setprio tracepoint

2010-09-21 10:56:41 -04:00

scsi.h

…

signal.h

…

skb.h

skb: Add tracepoints to freeing skb

2010-09-07 17:51:53 +02:00

syscalls.h

…

timer.h

…

vmscan.h

vmscan: narrow the scenarios in whcih lumpy reclaim uses synchrounous reclaim

2010-10-26 16:52:07 -07:00

workqueue.h

workqueue: add queue_work and activate_work trace points

2010-10-05 10:49:55 +02:00

writeback.h

writeback: do not sleep on the congestion queue if there are no congested BDIs or if significant congestion is not being encountered in the current zone

2010-10-26 16:52:07 -07:00