From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1759248AbbBIC7e (ORCPT <rfc822;w@1wt.eu>);
	Sun, 8 Feb 2015 21:59:34 -0500
Received: from v094114.home.net.pl ([79.96.170.134]:59614 "HELO
	v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with SMTP id S1755180AbbBIC7c (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 8 Feb 2015 21:59:32 -0500
From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
        Bjorn Helgaas <bhelgaas@google.com>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Subject: Re: linux-next: build failure after merge of the pm tree
Date: Mon, 09 Feb 2015 04:22:34 +0100
Message-ID: <2611810.oabrJWIJSx@vostro.rjw.lan>
User-Agent: KMail/4.11.5 (Linux/3.16.0-rc5+; KDE/4.11.5; x86_64; ; )
In-Reply-To: <54D82111.9090003@linux.intel.com>
References: <20150209132642.0d61b6ed@canb.auug.org.au> <54D82111.9090003@linux.intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="utf-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Monday, February 09, 2015 10:53:05 AM Jiang Liu wrote:
> 
> On 2015/2/9 10:26, Stephen Rothwell wrote:
> > Hi Rafael,

[cut]

> >                ^
> > 
> > Caused by commit 14d76b68f281 ("PCI: Use common resource list
> > management code instead of private implementation") interacting with
> > commit d2be00c0fb5a ("of/pci: Free resources on failure in
> > of_pci_get_host_bridge_resources()") from the pci tree.
> > 
> > I applied the following merge fix patch (which may need more work?).
> Hi Stephen,
> 	Thanks for fixing it and there should no more work needed.

Can you please have a look at my linux-next branch now and see if the code
is correct in there as well?

Rafael