linux-next: manual merge of the pci tree with the dma-mapping tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  arch/microblaze/include/asm/pci.h

between commit:

  325ef1857fff ("PCI: remove PCI_DMA_BUS_IS_PHYS")

from the dma-mapping tree and commits:

  2fe31eb73520 ("microblaze/PCI: Remove pcibios_finish_adding_to_bus() dead code")
  d52194a1e550 ("microblaze/PCI: Remove pcibios_claim_one_bus() dead code")

from the pci tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/microblaze/include/asm/pci.h
index 66cf3a5a2f83,54ee91964852..000000000000
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@@ -61,10 -62,12 +61,6 @@@ extern int pci_mmap_legacy_page_range(s
  
  #define HAVE_PCI_LEGACY	1
  
- extern void pcibios_claim_one_bus(struct pci_bus *b);
- 
- extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
 -/* The PCI address space does equal the physical memory
 - * address space (no IOMMU).  The IDE and SCSI device layers use
 - * this boolean for bounce buffer decisions.
 - */
 -#define PCI_DMA_BUS_IS_PHYS     (1)
--
  extern void pcibios_resource_survey(void);
  
  struct file;

Attachment: pgplniwulEepF.pgp
Description: OpenPGP digital signature