manual merge of tracing/immediates

Signed-off-by: Ingo Molnar <mingo@elte.hu>