linux-kernel - RE: linux-next: build failure after merge of the xen-two tree

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <DE8DF0795D48FD4CA783C40EC82923353FC036@SHSMSX101.ccr.corp.intel.com>
Date:	Fri, 15 Feb 2013 17:46:48 +0000
From:	"Liu, Jinsong" <jinsong.liu@...el.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
CC:	"Wu, Fengguang" <fengguang.wu@...el.com>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	"xen-devel@...ts.xensource.com" <xen-devel@...ts.xensource.com>
Subject: RE: linux-next: build failure after merge of the xen-two tree

Stephen Rothwell wrote:
> Hi Rafael,
> 
> On Fri, 15 Feb 2013 15:53:34 +0100 "Rafael J. Wysocki" <rjw@...k.pl>
> wrote: 
>> 
>> On Saturday, February 16, 2013 12:50:14 AM Stephen Rothwell wrote:
>>> 
>>> 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.
> 
> Or pull the acpi-scan branch into his tree and use my conflict
> resolution in the resulting merge thus requiring no rebasing. 
> However, Linus likes to see such interactions, so it can be left up
> to when the latter of the two tress is merged by Linus.

Per my understanding, currently in git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git, it has included
1). 636458de36f1, 0cd6ac52b333, b8bd759acd05: 	from pm tree (Rafael), drop acpi_bus_add, update argument of acpi_bus_scan
2). 259f201cb7ea, 181232c249f0:			from xen tree (Jinsong), use acpi_bus_add
3). 36bd3c64bfe2					Stephen fix confliction of 1) and 2)
Currently these are only some compiling warning left, so the only thing need to do is to add my patch to fix compile warning (just sent out minutes ago) to the top of git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git ?


Thanks,
Jinsong--
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/