Subject: Re: linux-next: manual merge of the pci tree

From: Jesse Barnes <[email-masked]>
Date: Mon, 20 Oct 2008 11:36:50 -0700

On Sunday, October 19, 2008 9:00 pm Stephen Rothwell wrote:
> Hi Jesse,
>
> Today's linux-next merge of the pci tree got a conflict in
> drivers/pci/quirks.c between commit
> 2e532d68a2b3e2aa6b19731501222069735c741c ("{pci,pnp} quirks.c: don't use
> deprecated print_fn_descriptor_symbol()") from Linus' tree and commit
> 9a1e6932e1129d0c6b5f06ea39282b21f892a114 ("PCI: allow quirks to be
> compiled out") from the pci tree.
>
> The former commit (which matches commit
> 248cb30af8bd95f1af95d54c0a9558dc2ac62a55 ("PCI: use %pF instead of
> print_fn_descriptor_symbol() in quirks.c") in the pci tree) updates code
> that was moved by the latter.  Since the pci tree also does that update,
> I just used the pci tree version.

Sounds good.  I just rebased onto master so that should be fixed up now.

-- 
Jesse Barnes, Intel Open Source Technology Center