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 15:53:34 +0100 From: "Rafael J. Wysocki" <rjw@...k.pl> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Liu Jinsong <jinsong.liu@...el.com> Subject: Re: linux-next: build failure after merge of the xen-two tree On Saturday, February 16, 2013 12:50:14 AM Stephen Rothwell wrote: > Hi Konrad, > > On Fri, 15 Feb 2013 08:26:24 -0500 Konrad Rzeszutek Wilk <konrad.wilk@...cle.com> wrote: > > > > Thank you. I keep on forgetting - but would it be OK for me to take this > > patch in my tree? Or should I not since this is a new functionality that > > Rafael is going to introduce in v3.9? > > It is an API change in the pm tree that is not yet in Linus' tree. > > > And if so, perhaps I should tack it on in my tree, once Rafael does a git > > pull to Linus? Or just point Linus to this git commit? > > You should point Linus at this patch if the pm tree is merged first, or > Rafael should do the same if the reverse happens. Alternatively, Konrad can pull the acpi-scan branch containing the changes in question from my tree into his tree and rebase the new material on top of that. Thanks, Rafael -- 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