lkml.org 
[lkml]   [2012]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the driver-core tree with Linus' tree
On Sun, Jan 29, 2012 at 06:35:17PM -0800, Greg KH wrote:
> 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.

This should now be resolved.

thanks,

greg k-h


\
 
 \ /
  Last update: 2012-02-02 20:29    [W:0.033 / U:1.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site