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

From: Ingo Molnar <[email-masked]>
Date: Tue, 1 Jul 2008 07:58:44 +0200

* Stephen Rothwell <[email-masked]> wrote:

> Hi Jesse,
> 
> Today's linux-next merge of the pci tree got a conflict in between 
> commit d752aed810d8c038a9a65819f0ba7c7da7425178 ("x86: rename 
> setup_32.c to setup.c") from the x86 tree and commit 
> e3f2baebf4209b5927e23fa65d5977d31db936b3 ("PCI/x86: early dump pci 
> conf space v2") from the pci tree.
> 
> The former merges setup_64.c into setup.c while the latter adds some 
> code to setup_arch in setup_64.c.  I applied the patch below to 
> setup.c. Probably worth checking that I did it right.

Jesse,

> +++ b/arch/x86/kernel/setup.c
> @@ -596,6 +596,13 @@ void __init setup_arch(char **cmdline_p)
>  
>  	parse_early_param();
>  
> +#ifdef CONFIG_X86_64
> +#ifdef CONFIG_PCI
> +	if (pci_early_dump_regs)
> +		early_dump_pci_devices();
> +#endif
> +#endif

hm, the commit looks a bit weird: why the ifdefs? There's nothing 64-bit 
about being able to dump early resources, and the CONFIG_PCI could be 
hidden as well.

	Ingo