linux-next: manual merge of the kvm tree with Linus' tree
in [Kernel]
|
Prev: inotify: race use after free/double free in inotify inode marks
Next: [PATCH] FIXED: arch/x86/kernel/hpet.c: /* FIXME: add schedule_work_on() */
From: Stephen Rothwell on 12 May 2010 23:50 Hi all, Today's linux-next merge of the kvm tree got a conflict in kernel/fork.c between commit 34441427aab4bdb3069a4ffcda69a99357abcb2e ("revert "procfs: provide stack information for threads" and its fixup commits") from Linus' tree and commit faa4602e47690fb11221e00f9b9697c8dc0d4b19 ("x86, perf, bts, mm: Delete the never used BTS-ptrace code") from the kvm tree (via a merge of part of the tip tree). Just context changes. I fixed it up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au diff --cc kernel/fork.c index 4c14942,5d3592d..0000000 --- a/kernel/fork.c +++ b/kernel/fork.c @@@ -1111,9 -1111,8 +1111,7 @@@ static struct task_struct *copy_process p->memcg_batch.do_batch = 0; p->memcg_batch.memcg = NULL; #endif - p->stack_start = stack_start; - p->bts = NULL; - /* Perform scheduler related setup. Assign this task to a CPU. */ sched_fork(p, clone_flags); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |