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

From: Liviu Dudau <[email-masked]>
Date: Mon, 3 Mar 2014 09:26:28 +0000

On Mon, Mar 03, 2014 at 06:03:35AM +0000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in
> drivers/pci/Makefile between commit 39656f29f665 ("PCI: Cleanup per-arch
> list of object files") from the pci tree and commit c5f9ee3d665a ("x86,
> platforms: Remove SGI Visual Workstation") from the tip tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen, that looks fine to me.

Best regards,
Liviu

> 
> -- 
> Cheers,
> Stephen Rothwell                    [email-masked]
> 
> diff --cc drivers/pci/Makefile
> index e2501ac6fe84,9d5ee4dcee7d..000000000000
> --- a/drivers/pci/Makefile
> +++ b/drivers/pci/Makefile
> @@@ -33,15 -33,20 +33,14 @@@ obj-$(CONFIG_PCI_IOV) += iov.
>   #
>   # Some architectures use the generic PCI setup functions
>   #
>  -obj-$(CONFIG_X86) += setup-bus.o
>  -obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_PARISC) += setup-bus.o
>  -obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_PPC) += setup-bus.o
>  -obj-$(CONFIG_FRV) += setup-bus.o
>  -obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_MN10300) += setup-bus.o
>  -obj-$(CONFIG_MICROBLAZE) += setup-bus.o
>  -obj-$(CONFIG_TILE) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_SPARC_LEON) += setup-bus.o setup-irq.o
>  -obj-$(CONFIG_M68K) += setup-bus.o setup-irq.o
>  +obj-$(CONFIG_ALPHA) += setup-irq.o
>  +obj-$(CONFIG_ARM) += setup-irq.o
>  +obj-$(CONFIG_UNICORE32) += setup-irq.o
>  +obj-$(CONFIG_SUPERH) += setup-irq.o
>  +obj-$(CONFIG_MIPS) += setup-irq.o
> - obj-$(CONFIG_X86_VISWS) += setup-irq.o
>  +obj-$(CONFIG_TILE) += setup-irq.o
>  +obj-$(CONFIG_SPARC_LEON) += setup-irq.o
>  +obj-$(CONFIG_M68K) += setup-irq.o
>   
>   #
>   # ACPI Related PCI FW Functions

-- 
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ¯\_(ツ)_/¯