From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: linux-next: acpi/cpus4096 merge conflict Date: Thu, 12 Jun 2008 00:46:15 -0400 (EDT) Message-ID: References: <20080612135032.b5d0c684.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Return-path: Received: from vms173005pub.verizon.net ([206.46.173.5]:33259 "EHLO vms173005pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750982AbYFLEqZ (ORCPT ); Thu, 12 Jun 2008 00:46:25 -0400 Received: from localhost.localdomain ([72.93.254.151]) by vms173005.mailsrvcs.net (Sun Java System Messaging Server 6.2-6.01 (built Apr 3 2006)) with ESMTPA id <0K2C00KH62A42AR3@vms173005.mailsrvcs.net> for linux-next@vger.kernel.org; Wed, 11 Jun 2008 23:39:41 -0500 (CDT) In-reply-to: <20080612135032.b5d0c684.sfr@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Mike Travis On Thu, 12 Jun 2008, Stephen Rothwell wrote: > Hi Len, > > Today's linux-next merge of the acpi tree got a trivial conflict in > drivers/acpi/processor_throttling.c between commit > 141ad0688adb53094d6f75b39b4b3b0625de0e07 ("acpi: use performance variant > for_each_cpu_mask_nr") from the cpus4096 tree and commit > 08a4ab4a5fd58438840524ce22199c6bbd05816f ("ACPI: change processors from > array to per_cpu variable") from the acpi tree. > > It is just a context conflict and I did the obvious fixup. thanks. it would be ideal if the cpus4096 tree didn't scribble on drivers/acpi -- though I don't know if partitioning those patches is practical. -Len