From: Liviu Dudau <Liviu.Dudau@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Peter Zijlstra <peterz@infradead.org>,
Bjorn Helgaas <bhelgaas@google.com>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the pci tree
Date: Mon, 3 Mar 2014 09:26:28 +0000 [thread overview]
Message-ID: <20140303092628.GX1692@e106497-lin.cambridge.arm.com> (raw)
In-Reply-To: <20140303170335.7a4dd42c6e4f4b9034144a25@canb.auug.org.au>
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 sfr@canb.auug.org.au
>
> 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! /
---------------
¯\_(ツ)_/¯
next prev parent reply other threads:[~2014-03-03 9:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-03 6:03 linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell
2014-03-03 9:26 ` Liviu Dudau [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-09 2:47 Stephen Rothwell
2023-10-31 23:15 ` Stephen Rothwell
2022-11-21 4:11 Stephen Rothwell
2020-11-30 4:03 Stephen Rothwell
2020-11-30 10:21 ` Borislav Petkov
2020-11-30 17:40 ` Bjorn Helgaas
2020-10-01 6:38 Stephen Rothwell
2020-10-01 16:06 ` Bjorn Helgaas
2020-09-25 5:35 Stephen Rothwell
2020-10-13 3:34 ` Stephen Rothwell
2020-09-25 5:21 Stephen Rothwell
2020-10-13 3:31 ` Stephen Rothwell
2017-06-28 3:15 Stephen Rothwell
2017-06-29 0:14 ` Christoph Hellwig
2016-12-09 2:38 Stephen Rothwell
2016-12-12 16:09 ` Bjorn Helgaas
2014-11-24 5:18 Stephen Rothwell
2014-11-24 10:51 ` Thomas Gleixner
2014-03-12 22:18 Mark Brown
2014-03-03 6:07 Stephen Rothwell
2013-10-29 6:33 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140303092628.GX1692@e106497-lin.cambridge.arm.com \
--to=liviu.dudau@arm.com \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).