lkml.org 
[lkml]   [2013]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the pm tree with the pci tree
Date
Hi,

On Wednesday, February 20, 2013 12:55:55 PM Stephen Rothwell wrote:
> Hi Rafael,
>
> Today's linux-next merge of the pm tree got a conflict in
> drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
> cache _PRT, and don't associate them with bus numbers") from the pci tree
> and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices
> depending on power resources") from the pm tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the notice and fix.

Rafael


--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.


\
 
 \ /
  Last update: 2013-02-20 14:21    [W:0.032 / U:0.452 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site