Subject: Re: linux-next: build failure after merge of the pci-current tree

From: Jesse Barnes <[email-masked]>
Date: Wed, 4 Jan 2012 16:11:22 -0800

On Thu, 5 Jan 2012 11:07:12 +1100
Stephen Rothwell <[email-masked]> wrote:

> Hi Jesse,
> 
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> arch/x86/pci/acpi.c:81:46: error: expected '}' before ';' token
> 
> Caused by commit 4c33d0af35ba ("PCI: Add Dell Studio 1557 to pci=nocrs
> blacklist").  Please build test your tree ...
> 
> I have used the pci-current tree from next-20120104 for today.

Arg failure of my hand merge.  Will fix now.

-- 
Jesse Barnes, Intel Open Source Technology Center