From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757520Ab0EMDnN (ORCPT ); Wed, 12 May 2010 23:43:13 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:56047 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753454Ab0EMDnL (ORCPT ); Wed, 12 May 2010 23:43:11 -0400 Date: Thu, 13 May 2010 13:43:06 +1000 From: Stephen Rothwell To: Avi Kivity , Marcelo Tosatti Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Zijlstra , Robin Holt , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Subject: linux-next: manual merge of the kvm tree with Linus' tree Message-Id: <20100513134306.d6b37362.sfr@canb.auug.org.au> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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@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);