[<prev] [next>] [day] [month] [year] [list]
Date: Mon, 3 Mar 2014 17:07:07 +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
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 conflicts in
arch/x86/pci/numaq_32.c and arch/x86/pci/visws.c between commit
8d7d818676d3 ("x86/PCI: Use pcibios_scan_root() instead of
pci_scan_bus_with_sysdata()") from the pci tree and commits c5f9ee3d665a
("x86, platforms: Remove SGI Visual Workstation") and b5660ba76b41 ("x86,
platforms: Remove NUMAQ") from the tip tree.
I just removed the files and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists