lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 15 Feb 2013 13:51:46 +0100 From: "Rafael J. Wysocki" <rjw@...k.pl> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Yinghai Lu <yinghai@...nel.org>, Bjorn Helgaas <bhelgaas@...gle.com>, Jiang Liu <jiang.liu@...wei.com> Subject: Re: linux-next: manual merge of the pm tree with the pci tree On Friday, February 15, 2013 12:23:13 PM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in > drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between > commits 668192b67820 ("PCI: acpiphp: Move host bridge hotplug to > pci_root.c") and be6d2867b4f6 ("PCI: acpiphp: Remove dead code for PCI > host bridge hotplug") from the pci tree and commit 3757b94802fb ("ACPI / > hotplug: Fix concurrency issues and memory leaks") from the pm tree. > > I fixed it up (thanks to Yinghai Lu for the resolution - see below) and > can carry the fix as necessary (no action is required). Thanks Stephen! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists