From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bjorn Helgaas <bhelgaas@google•com>, Christoph Hellwig <hch@lst•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the pci tree with the dma-mapping tree
Date: Tue, 8 May 2018 09:25:55 +1000 [thread overview]
Message-ID: <20180508092555.01818b20@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1522 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-05-07 23:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180508092555.01818b20@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bhelgaas@google$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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