From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: manual merge of the driver-core tree with Linus' tree Date: Sun, 29 Jan 2012 18:35:17 -0800 Message-ID: <20120130023517.GA7937@kroah.com> References: <20120130132451.1049903dbf990fed5876e5bc@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out3-smtp.messagingengine.com ([66.111.4.27]:46130 "EHLO out3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752969Ab2A3CfZ (ORCPT ); Sun, 29 Jan 2012 21:35:25 -0500 Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 6AD4420E10 for ; Sun, 29 Jan 2012 21:35:24 -0500 (EST) Content-Disposition: inline In-Reply-To: <20120130132451.1049903dbf990fed5876e5bc@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , Len Brown , Thomas Renninger , Len Brown On Mon, Jan 30, 2012 at 01:24:51PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > drivers/acpi/processor_driver.c between commit 54d5dcc45af7 ("ACPI > processor hotplug: Split up acpi_processor_add") from Linus' tree and > commit 9061e0e16700 ("ACPI: Load acpi-cpufreq from processor driver > automatically") from the driver-core tree. > > I fixed it up (I think- see below) and can carry the fix as necessary. Thanks, I'll merge the driver-core next tree when 3.3-rc2 is out to resolve this problem. greg k-h