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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 3 Mar 2014 17:03:35 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Liviu Dudau <Liviu.Dudau@....com>
Subject: linux-next: manual merge of the tip tree with the pci tree

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).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.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

Content of type "application/pgp-signature" skipped