From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" 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> References: <20150209132642.0d61b6ed@canb.auug.org.au> <54D82111.9090003@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7Bit Return-path: In-Reply-To: <54D82111.9090003@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org To: Jiang Liu Cc: Stephen Rothwell , Bjorn Helgaas , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Lorenzo Pieralisi List-Id: linux-next.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